--- a/locationrequestmgmt/locationserver/src/EPos_CPosServer.cpp Tue Aug 31 16:38:06 2010 +0300
+++ b/locationrequestmgmt/locationserver/src/EPos_CPosServer.cpp Wed Sep 01 12:35:25 2010 +0100
@@ -41,7 +41,6 @@
#include "EPos_CPosLocMonitorReqHandlerHub.h"
#include "EPos_Global.h"
-#include "lbspositioningstatusprops.h"
// CONSTANTS
_LIT(KPosResourceFile, "\\private\\101F97B2\\eposserver.rsc");
@@ -179,6 +178,12 @@
}
#endif // WINSCW
+ // make sure that root process is running
+ if(LocationManagementSupported && !FindRootProcess())
+ {
+ User::Leave(KErrNotReady);
+ }
+
// Backup listener
DEBUG_TRACE("Checking for backup or restore...", __LINE__)
iBackupListener = CPosBackupListener::NewL();
@@ -214,11 +219,10 @@
DEBUG_TRACE("Setting Location Settings observer...", __LINE__)
iModuleSettings->AddListenerL(*this);
- // Define the MO Positioning Status property
- LbsPositioningStatusProps::InitializeMoPropertyL();
-
DEBUG_TRACE("Starting server active object...", __LINE__)
StartL(KPositionServerName);
+
+
}
/**
@@ -238,6 +242,7 @@
*/
CPosServer::~CPosServer()
{
+
delete iLocMonitorReqHandlerHub;
delete iShutdown;
@@ -245,7 +250,7 @@
delete iModuleSettings;
delete iBackupListener;
-
+
// This is needed because CPositioner might have used ECom (PSYs)
REComSession::FinalClose();
}