# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1273588277 -10800
# Node ID cf8bf9651775a244a7c511f46d463366e355d194
# Parent  54d74d2170426a2e9bbf8d5d062a63e5b1e321a2
Revision: 201014
Kit: 201019

diff -r 54d74d217042 -r cf8bf9651775 locationmgmt/locationcore/conf/locationsettings.confml
Binary file locationmgmt/locationcore/conf/locationsettings.confml has changed
diff -r 54d74d217042 -r cf8bf9651775 locationmgmt/locationcore/lbslocsettings/data/101f500c.txt
Binary file locationmgmt/locationcore/lbslocsettings/data/101f500c.txt has changed
diff -r 54d74d217042 -r cf8bf9651775 locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitorrequesthandler.cpp
--- a/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitorrequesthandler.cpp	Wed Apr 14 17:26:05 2010 +0300
+++ b/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitorrequesthandler.cpp	Tue May 11 17:31:17 2010 +0300
@@ -52,9 +52,7 @@
 	// Allocate space for 1 pointer to area info source object (Global Cell Id)
 	iCurrentAreaInfo.ReserveL(ELastAreaInfoType);
 	TLbsLocMonitorAreaInfoGci* locMonitorAreaInfoGci = new(ELeave) TLbsLocMonitorAreaInfoGci;
-	CleanupStack::PushL(locMonitorAreaInfoGci);
 	iCurrentAreaInfo.Insert(static_cast<TLbsLocMonitorAreaInfoBase*>(locMonitorAreaInfoGci), EGlobalCellIdType);
-	CleanupStack::Pop(locMonitorAreaInfoGci);
 	
 	iDb.OpenL();
 	}
diff -r 54d74d217042 -r cf8bf9651775 locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf
--- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf	Wed Apr 14 17:26:05 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf	Tue May 11 17:31:17 2010 +0300
@@ -20,7 +20,7 @@
 
 
 // File needs to be exported to allow UI layer to access it. Otherwise code duplication/differentiation will occur.
-..\inc\EPos_TPosQNInputData.h      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/EPos_TPosQNInputData.h)
+../inc/EPos_TPosQNInputData.h      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/epos_tposqninputdata.h)
 
 
 // End of file
diff -r 54d74d217042 -r cf8bf9651775 locationrequestmgmt/networkrequesthandler/src/EPos_CPosDialogCtrl.cpp
--- a/locationrequestmgmt/networkrequesthandler/src/EPos_CPosDialogCtrl.cpp	Wed Apr 14 17:26:05 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/src/EPos_CPosDialogCtrl.cpp	Tue May 11 17:31:17 2010 +0300
@@ -78,8 +78,6 @@
     for (TInt i = 0; i < count; i++)
         {
         DoCompleteRequest(0, KErrServerTerminated);
-        // Delete the pointer items
-        delete iRequestQueue[i].iRequestInfo;
         }
 
     iNotifier.Close();
@@ -279,8 +277,16 @@
     TInt aIndex,
     TInt aCompletionCode)
     {
-    TRequestStatus* status = iRequestQueue[aIndex].iStatus;
-    User::RequestComplete(status, aCompletionCode);
+    TRequest request = iRequestQueue[aIndex];
+    if (request.iType == TPosQNInputData::ENotification)
+        {
+        delete request.iRequestInfo;
+        }
+    else
+        {
+        TRequestStatus* status = request.iStatus;
+        User::RequestComplete(status, aCompletionCode);
+        }
     iRequestQueue.Remove(aIndex);
     iRequestQueue.Compress();
     }
@@ -365,22 +371,10 @@
         delete reqStackBuf;
         reqStackBuf = NULL;
 
-        if (data.iType == TPosQNInputData::ENotification) // We dont expect a resonse from a notfication
-            {
-            iNotifier.StartNotifier(KNotifierUid, nullPtr, nullPtr);
-            
-            // As we wont be getting a response remove from the notification list
-            delete iRequestQueue[0].iRequestInfo;
-            iRequestQueue.Remove(0);
-            iRequestQueue.Compress();
-            }
-        else
-            {
-            iNotifier.StartNotifierAndGetResponse(
-                    iStatus, KNotifierUid, nullPtr, nullPtr);
-            SetActive();
-            }
-        
+        iNotifier.StartNotifierAndGetResponse(
+            iStatus, KNotifierUid, nullPtr, nullPtr);
+        SetActive();
+
         err = iNotifier.UpdateNotifier(KNotifierUid, *buffer, nullPtr);
         if (err != KErrNone)
             {
diff -r 54d74d217042 -r cf8bf9651775 locationrequestmgmt/networkrequesthandler/src/EPos_CPosPrivManager.cpp
--- a/locationrequestmgmt/networkrequesthandler/src/EPos_CPosPrivManager.cpp	Wed Apr 14 17:26:05 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/src/EPos_CPosPrivManager.cpp	Tue May 11 17:31:17 2010 +0300
@@ -287,7 +287,6 @@
             {
             iRequestData.iNotificationReason = EPosDecisionByRequestSource;
             iDlgCtrl->NotifyL(*iRequestInfo, iRequestData);
-            delete iRequestInfo;
             iRequestInfo = NULL;
             iRequestInfo = new (ELeave) TLbsExternalRequestInfo2;
             }
@@ -396,7 +395,6 @@
     iRequestData.iCancelReason = EPosCancelReasonNotAvailable;
 
     iDlgCtrl->NotifyL(*iRequestInfo, iRequestData);
-    delete iRequestInfo;
     iRequestInfo = NULL;
     iRequestInfo = new (ELeave) TLbsExternalRequestInfo2;
     }