# HG changeset patch
# User hgs
# Date 1282565983 -19800
# Node ID 24e118dfbea1118f2c0f90e8b392f1356b7eb450
# Parent  3efc7a0e8755f66e01f6163d5202877d78383b54
201033

diff -r 3efc7a0e8755 -r 24e118dfbea1 genericpositioningplugins/group/bld.inf
--- a/genericpositioningplugins/group/bld.inf	Fri Aug 06 19:34:22 2010 +0530
+++ b/genericpositioningplugins/group/bld.inf	Mon Aug 23 17:49:43 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -15,16 +15,12 @@
 *
 */
 
+PRJ_PLATFORMS
+WINSCW ARMV5 GCCE
 
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT GCCE
+#include "../rom/bld.inf"
 
 #include "../locationnpppsy/group/bld.inf"
 #include "../locationsuplpsy/group/bld.inf"
 
-PRJ_EXPORTS
-../cenrep/1028224B_s60.cre                      z:/private/10202be9/1028224B_s60.cre
-../rom/prifw_cenrep.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(prifw_cenrep.iby)
-
 // End of File
diff -r 3efc7a0e8755 -r 24e118dfbea1 genericpositioningplugins/rom/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/genericpositioningplugins/rom/bld.inf	Mon Aug 23 17:49:43 2010 +0530
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  The common build file.
+*
+*/
+
+
+#include <platform_paths.hrh>
+PRJ_PLATFORMS
+DEFAULT GCCE
+
+PRJ_EXPORTS
+../cenrep/1028224B_s60.cre                      z:/private/10202be9/1028224B_s60.cre
+prifw_cenrep.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(prifw_cenrep.iby)
+
+// End of File
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationsystemui/locationsysui/possettings/poslocationservices/src/poslocationservices.cpp
--- a/locationsystemui/locationsysui/possettings/poslocationservices/src/poslocationservices.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationsystemui/locationsysui/possettings/poslocationservices/src/poslocationservices.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -216,7 +216,7 @@
                     Qt::ISODate));
 
             service->setContentWidgetData("sec2text", QString(hbTrId(
-                    "txt_loe_list_valid_until_2")).arg(validity));
+                    "txt_loe_list_valid_until_1")).arg(validity));
 
             qDebug() << "Adding service into the group";
             mOperation->appendDataFormItem(service, mGroup);
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationsystemui/locationsysui/privacyverifiernotifierui/posverificationdialogplugin/resources/posverificationcustomdialog.docml
--- a/locationsystemui/locationsysui/privacyverifiernotifierui/posverificationdialogplugin/resources/posverificationcustomdialog.docml	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationsystemui/locationsysui/privacyverifiernotifierui/posverificationdialogplugin/resources/posverificationcustomdialog.docml	Mon Aug 23 17:49:43 2010 +0530
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
     <object name="qtl_dialog_softkey_2_left" type="HbAction">
-        <string name="role" value="HbDialog:primaryAction"/>
         <string locid="txt_loe_button_accept" name="text" value="Accept"/>
     </object>
     <object name="qtl_dialog_softkey_2_right" type="HbAction">
-        <string name="role" value="HbDialog:secondaryAction"/>
         <string locid="txt_common_button_reject" name="text" value="Reject"/>
     </object>
     <widget name="PosVerificationCustomDialog" type="PosVerificationCustomDialog">
@@ -26,35 +24,35 @@
                         <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                         <sizehint height="14un" type="PREFERRED" width="5.67164un"/>
                         <sizehint height="14un" type="MINIMUM"/>
-                        <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="0" top="0"/>
                         <sizehint type="MAXIMUM" width="50un"/>
                         <string name="plainText" value="Your location will be shared by default if you don't respond"/>
                         <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
                     </widget>
                     <widget name="requestors" type="HbWidget">
                         <real name="z" value="0"/>
+                        <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="MinimumExpanding" verticalStretch="0"/>
                         <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
                         <layout type="stacked"/>
                     </widget>
                     <real name="z" value="0"/>
-                    <sizehint height="29.25373un" type="PREFERRED" width="49.85075un"/>
+                    <sizehint height="21.49254un" type="PREFERRED" width="45.8209un"/>
                     <sizehint height="2504062.01158un" type="MAXIMUM"/>
                     <layout orientation="Vertical" type="linear">
-                        <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
                         <linearitem itemname="queryText_1"/>
                         <linearitem itemname="requestors"/>
                     </layout>
                 </widget>
                 <real name="z" value="0"/>
                 <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-                <sizehint height="50un" type="PREFERRED" width="50un"/>
+                <sizehint height="21.9403un" type="PREFERRED" width="45.73134un"/>
                 <sizehint height="2504062.01158un" type="MAXIMUM"/>
                 <layout type="anchor">
-                    <anchoritem dst="container_2" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                    <anchoritem dst="container_2" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                    <anchoritem dst="container_2" dstEdge="LEFT" src="" srcEdge="LEFT"/>
+                    <anchoritem dst="container_2" dstEdge="TOP" src="" srcEdge="TOP"/>
                 </layout>
             </widget>
             <real name="z" value="1"/>
+            <enums name="clampingStyle" value="StrictClamping"/>
         </widget>
         <ref object="qtl_dialog_softkey_2_left" role="HbWidget:addAction"/>
         <ref object="qtl_dialog_softkey_2_right" role="HbWidget:addAction"/>
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationsystemui/locationsysui/privacyverifiernotifierui/posverificationdialogplugin/src/posverificationcustomdialog.cpp
--- a/locationsystemui/locationsysui/privacyverifiernotifierui/posverificationdialogplugin/src/posverificationcustomdialog.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationsystemui/locationsysui/privacyverifiernotifierui/posverificationdialogplugin/src/posverificationcustomdialog.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -242,10 +242,16 @@
     QSizePolicy policy;
     policy.setHorizontalPolicy(QSizePolicy::Preferred);
     policy.setVerticalPolicy(QSizePolicy::Ignored);
+    QSizePolicy text2Policy;
+    text2Policy.setHorizontalPolicy(QSizePolicy::Preferred);
+    text2Policy.setVerticalPolicy(QSizePolicy::Preferred);
+    text2Policy.setHorizontalStretch(0);
+    
     if (mQueryText2)
         {
-        mQueryText2->setSizePolicy(policy);
+        mQueryText2->setSizePolicy(text2Policy);
         mQueryText2->setAlignment(Qt::AlignTop);
+        mQueryText2->setTextWrapping(Hb::TextWordWrap);
         layout->addItem(mQueryText2, 1, 0);
         layout->setRowSpacing(1, margin);
         layout->setContentsMargins(leftmargin, 0, 0, 0);
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/group/bld.inf
--- a/locationtriggering/group/bld.inf	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationtriggering/group/bld.inf	Mon Aug 23 17:49:43 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,28 +16,10 @@
 *
 */
 
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS  
-DEFAULT GCCE
-
-PRJ_EXPORTS
-#ifdef CORE_MW_LAYER_IBY_EXPORT_PATH
-../rom/locationtriggering.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggering.iby)
-../rom/locationtriggeringstub.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggeringstub.iby)
+PRJ_PLATFORMS
+WINSCW ARMV5 GCCE
 
-// Export SIS File
-../data/lbtstub.sis  					/epoc32/data/z/system/install/lbtstub.sis
-
-#endif
-
-#ifdef MW_LAYER_CONFML
-../conf/lbtsettings.confml							  MW_LAYER_CONFML(lbtsettings.confml)
-#endif
-
-#ifdef MW_LAYER_CRML
-../conf/lbtsettings_1028312F.crml					  MW_LAYER_CRML(lbtsettings_1028312F.crml)
-#endif
+#include "../rom/bld.inf"
 
 #include "../ltlogger/group/bld.inf"
 #include "../ltclientlib/group/bld.inf"
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/ltcontainer/src/lbtcontainerareafilter.cpp
--- a/locationtriggering/ltcontainer/src/lbtcontainerareafilter.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationtriggering/ltcontainer/src/lbtcontainerareafilter.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -330,7 +330,7 @@
 	TInt i;
 	if(contExtInfo!=NULL)
              	{
-                 if((isFilterPresent>0 && isEntryRequested && iHystRadiusArray.Count()>0) || (iHystRadiusArray.Count()>0 && isFilterPresent==0 ))  
+                 if( iHystRadiusArray.Count()>0)  
                     {
                     isFilterPresent++;
                     isEntryRequested=EFalse;
@@ -346,8 +346,10 @@
                     }
                      
                     
-                    if((isFilterPresent>0 && isEntryRequested && iTriggerFiredArray.Count()>0) || (iTriggerFiredArray.Count()>0 && isFilterPresent==0 ))  
+                    if((isFilterPresent>0 && isEntryRequested ) || ( isFilterPresent==0 ))  
                         {
+                        	if(iTriggerFiredArray.Count()>0)
+                        		{
                         isFilterPresent++;
                         isEntryRequested=EFalse;
                         for(i=0;i<iTriggerFiredArray.Count();i++)
@@ -359,6 +361,7 @@
                     		    }
                    		    }
                         }
+                      }
                         
                      if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 ))  
                         {
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/ltcontainer/src/lbtcontainerattrfilter.cpp
--- a/locationtriggering/ltcontainer/src/lbtcontainerattrfilter.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationtriggering/ltcontainer/src/lbtcontainerattrfilter.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -58,7 +58,7 @@
         TInt i=0;
         if(trigEntry!=NULL)
         	{
-            if((isFilterPresent>0 && isEntryRequested) || (iTriggerStateArray.Count()>0 && isFilterPresent==0))
+            if( iTriggerStateArray.Count()>0 )
             	{
                  isFilterPresent++;
                  for(i=0;i<iTriggerStateArray.Count();i++)
@@ -70,9 +70,11 @@
                         }
                     }
                 }
-            if( (isFilterPresent>0 && isEntryRequested && iTriggerValidityArray.Count()>0) || 
-                (iTriggerValidityArray.Count()>0 && isFilterPresent==0) )
+            if( (isFilterPresent>0 && isEntryRequested ) || 
+                (isFilterPresent==0) )
                 {
+                	if(iTriggerValidityArray.Count()>0)
+                		{
                 isFilterPresent++;
                 isEntryRequested=EFalse;
                 for(i=0;i<iTriggerValidityArray.Count();i++)
@@ -83,6 +85,7 @@
                       }                
                    }
                 }
+              }
                    
             if((isFilterPresent>0 && isEntryRequested && iTriggerTypeArray.Count()>0) || (iTriggerTypeArray.Count()>0 && isFilterPresent==0))
                 {
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/ltcontainer/src/lbtcontainercompfilter.cpp
--- a/locationtriggering/ltcontainer/src/lbtcontainercompfilter.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationtriggering/ltcontainer/src/lbtcontainercompfilter.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -88,7 +88,7 @@
 	TInt i;
 	if(contExtInfo!=NULL)
              	{
-                 if((isFilterPresent>0 && isEntryRequested && iHystRadiusArray.Count()>0) || (iHystRadiusArray.Count()>0 && isFilterPresent==0 ))  
+                 if( iHystRadiusArray.Count()>0)  
                     {
                     isFilterPresent++;
                     isEntryRequested=EFalse;
@@ -104,8 +104,10 @@
                     }
                      
                     
-                    if((isFilterPresent>0 && isEntryRequested && iTriggerFiredArray.Count()>0) || (iTriggerFiredArray.Count()>0 && isFilterPresent==0 ))  
+                    if((isFilterPresent>0 && isEntryRequested  ) ||  isFilterPresent==0 )  
                         {
+                        	if(iTriggerFiredArray.Count()>0)
+                        		{
                         isFilterPresent++;
                         isEntryRequested=EFalse;
                         for(i=0;i<iTriggerFiredArray.Count();i++)
@@ -117,6 +119,7 @@
                     		    }
                    		    }
                         }
+                      }
                         
                      if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 ))  
                         {
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/ltcontainer/src/lbtdboperationao.cpp
--- a/locationtriggering/ltcontainer/src/lbtdboperationao.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationtriggering/ltcontainer/src/lbtdboperationao.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -58,7 +58,12 @@
         }
     
     iView = &aView;
-    iView->Prepare( iDb, TDbQuery(aQuery, EDbCompareFolded) );
+    TInt err =iView->Prepare( iDb, TDbQuery(aQuery, EDbCompareFolded) );
+    if( err != KErrNone )
+ 	   {
+ 	        TRequestStatus* status = &iStatus;
+          User::RequestComplete(status, err);
+     }
     iView->Evaluate(iStatus);
     SetActive();
     iOperation = EDbSqlQuery;
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp
--- a/locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp	Fri Aug 06 19:34:22 2010 +0530
+++ b/locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp	Mon Aug 23 17:49:43 2010 +0530
@@ -364,16 +364,16 @@
         {
         case EOpStateQuery:
             {
-            iView.FirstL();
+             
             // check if view is empty, return KErrNotFound
-            if( iView.IsEmptyL() || !iView.AtRow() )
+            if( iView.IsEmptyL() || !iView.AtRow() || !iView.FirstL() )
                 {
                 CompleteClientRequest( KErrNotFound );
                 break;
                 }       
             // Start iterating through all the triggers in view            
             iOperationState = EOpStateIterating;
-            iView.FirstL();
+                       
             }
             // Omitting break is intentional
        case EOpStateIterating:
@@ -763,14 +763,14 @@
         case EOpStateQuery:
             {
             // check if view is empty, return KErrNotFound
-            if( iView.IsEmptyL() )
+            if( iView.IsEmptyL() || !iView.FirstL())
                 {
                 CompleteClientRequest( KErrNotFound );
                 break;
                 }       
             // Start iterating through all the triggers in view            
             iOperationState = EOpStateIterating;
-            iView.FirstL();
+           
             }
             // Omitting break is intentional
         case EOpStateIterating:
@@ -835,8 +835,10 @@
                         }
                     CleanupStack::PopAndDestroy(entry);
                     }       
-                iView.NextL();       
-                }
+                 TBool res =iView.NextL();   
+                 if (!res)
+                 	break;
+              }
             
             if( count >= KStepCount )
                 {
@@ -869,7 +871,7 @@
         case EOpStateQuery:
             {
             // check if view is empty, return KErrNotFound
-            if( iView.IsEmptyL() )
+            if( iView.IsEmptyL() || !iView.FirstL())
                 {
                 CompleteClientRequest( KErrNotFound );
                 break;
@@ -877,7 +879,8 @@
             
             // Start iterating through all the triggers in view            
             iOperationState = EOpStateIterating;
-            iView.FirstL();
+            
+            
             }
             // Omitting break is intentional
         case EOpStateIterating:
@@ -924,7 +927,10 @@
                             }
                         CleanupStack::PopAndDestroy( entry );
                         }
-                    iView.NextL();
+                    
+                     TBool res = iView.NextL();
+                      if(!res)
+            	         break;
                     }                
                 }
 
@@ -982,7 +988,8 @@
                 }
             }
 
-        iView.NextL();
+        if(!iView.NextL())
+        	break;
         }
 
     if( count >= KStepCount )
@@ -1321,7 +1328,11 @@
     PrepareViewForTriggersL( aTriggerIds, iView );
  
     // rest of list triggers operation is in the method HandleGetTriggersEventL.
-    iView.FirstL();
+   if(!iView.FirstL())
+   {
+   	CompleteClientRequest( KErrNotFound );
+	return;
+	}
     SelfComplete();
 	}
 
@@ -1395,7 +1406,12 @@
     PrepareViewForListingL( iView );
     
     // rest of list triggers operation is in the method HandleListTriggersEventL.
-    iView.FirstL();
+    
+	if(!iView.FirstL())
+   {
+   	CompleteClientRequest( KErrNotFound );
+	return;
+	}
     iFilterBase = LbtContainerUtilities::GetContainerFilterFromListOptionsLC(iFilter);
     CleanupStack::Pop(1); // iFilterBase
     
@@ -1507,9 +1523,13 @@
     sql.AppendNum( aTriggerId );
     
     // Execute the query to delete the entry
-    iDbOperation->ExecuteSyncQuery( view, sql );
-   	view.Close();
-    }
+    TInt err =iDbOperation->ExecuteSyncQuery( view, sql );
+    if( err != KErrNone )
+    	{
+    		LOG("err");
+    	}
+ 	   	view.Close();
+       }
 
 //---------------------------------------------------------------------------
 // CLbtDbTriggersManager::AddGeoCellIntoDbL
@@ -1759,10 +1779,15 @@
 
     iIdArray.Reset();
     RDbView view;
+     CleanupClosePushL( view );
     PrepareViewForTriggersL( aTriggerIds, view );
+    if(!view.FirstL())
+	   {
+	     CompleteClientRequest( KErrNotFound );
+       return;
+	   }
+   
     
-    CleanupClosePushL( view );
-    view.FirstL();
     while(view.AtRow())
         {
         view.GetL();
@@ -1815,7 +1840,8 @@
                     }
                 }
             }
-        view.NextL();
+        if(!view.NextL())
+        	break;
         }
     CleanupStack::PopAndDestroy(); // view
     User::RequestComplete( status, KErrNone );
@@ -1853,7 +1879,12 @@
 
   	TBool found = EFalse;
   	CleanupClosePushL( view );
-  	view.FirstL();
+  	
+	if(!view.FirstL())
+	{
+	CompleteClientRequest( KErrNotFound );
+    return;
+	}
   	while(view.AtRow())
     	{
     	view.GetL();
@@ -1870,8 +1901,10 @@
 	 	    	view.PutL();
 	 	    	}
     		}
-    	view.NextL();
-    	}
+    	if(!view.NextL())
+    		break;
+    			
+    }
     CleanupStack::PopAndDestroy(); //view
 
     TInt error = KErrNone;
@@ -2036,10 +2069,12 @@
                 User::Leave(error);
                 }
             CleanupClosePushL(hybridView);
-            hybridView.FirstL();
+            if(hybridView.FirstL())
+            	{
             hybridView.GetL();
             hybridView.DeleteL();
             hybridView.Close();
+              }
             CleanupStack::PopAndDestroy(1); // hybridView            
             break;
             }
@@ -2589,7 +2624,8 @@
 	    		}
     		}
 
-    	iView.NextL();
+    	if(!iView.NextL())
+    		break;
     	}
     
     if( count >= KStepCount )
diff -r 3efc7a0e8755 -r 24e118dfbea1 locationtriggering/rom/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationtriggering/rom/bld.inf	Mon Aug 23 17:49:43 2010 +0530
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  This file provides the information required for building the 
+*		         LBT FW
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS  
+DEFAULT GCCE
+
+PRJ_EXPORTS
+#ifdef CORE_MW_LAYER_IBY_EXPORT_PATH
+../rom/locationtriggering.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggering.iby)
+../rom/locationtriggeringstub.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggeringstub.iby)
+
+// Export SIS File
+../data/lbtstub.sis  					/epoc32/data/z/system/install/lbtstub.sis
+
+#endif
+
+#ifdef MW_LAYER_CONFML
+../conf/lbtsettings.confml							  MW_LAYER_CONFML(lbtsettings.confml)
+#endif
+
+#ifdef MW_LAYER_CRML
+../conf/lbtsettings_1028312F.crml					  MW_LAYER_CRML(lbtsettings_1028312F.crml)
+#endif
+
+PRJ_MMPFILES
+
+// End of file
diff -r 3efc7a0e8755 -r 24e118dfbea1 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Mon Aug 23 17:49:43 2010 +0530
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="locationsrv" name="Location Services" levels="plugin fw server if">
+  <collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+   <component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_search_api/landmarks_search_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_search_api/group"/>
+   </component>
+   <component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_api/landmarks_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_api/group"/>
+   </component>
+   <component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_database_management_api/landmarks_database_management_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_database_management_api/group"/>
+   </component>
+   <component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/location_triggering_api/location_triggering_api.metaxml"/>
+    <unit bldFile="locsrv_pub/location_triggering_api/group"/>
+   </component>
+   <component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/blid_application_satellite_info_api/blid_application_satellite_info_api.metaxml"/>
+    <unit bldFile="locsrv_pub/blid_application_satellite_info_api/group"/>
+   </component>
+  </collection>
+  <collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+   <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/geocoding_api/geocoding_api.metaxml"/>
+    <unit bldFile="locsrv_plat/geocoding_api/group"/>
+   </component>
+   <component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" class="api" filter="s60">
+	<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+	 -->
+   </component>
+   <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/landmarks_category_definition_api/landmarks_category_definition_api.metaxml"/>
+    <unit bldFile="locsrv_plat/landmarks_category_definition_api/group"/>
+   </component>
+   <component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_settings_api/supl_settings_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_settings_api/group"/>
+   </component>
+   <component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/np_proxy_configuration_api/np_proxy_configuration_api.metaxml"/>
+    <unit bldFile="locsrv_plat/np_proxy_configuration_api/group"/>
+   </component>
+   <component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_terminal_initiation_api/supl_terminal_initiation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_terminal_initiation_api/group"/>
+   </component>
+   <component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_network_initiation_api/supl_network_initiation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_network_initiation_api/group"/>
+   </component>
+   <component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/oma_supl_configuration_parameter_api/oma_supl_configuration_parameter_api.metaxml"/>
+    <unit bldFile="locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+   </component>
+   <component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_triggering_management_api/location_triggering_management_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_triggering_management_api/group"/>
+   </component>
+   <component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_triggering_status_information_api/location_triggering_status_information_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_triggering_status_information_api/group"/>
+   </component>
+   <component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+    <unit bldFile="locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+   </component>
+  <component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60" introduced="^3">
+      <unit bldFile="locsrv_plat/query_and_notification_api/group"/>
+   </component>
+   <component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/location_local_variation_api/location_local_variation_api.metaxml"/>
+    <unit bldFile="locsrv_plat/location_local_variation_api/group"/>
+   </component>
+  </collection>
+  <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+   <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+    <unit bldFile="genericpositioningplugins/locationnpppsy/group"/>
+   </component>
+   <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+    <unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
+   </component>
+   <component id="genericpositioningplugins_rom" filter="s60" name="Generic Positioning Plugins ROM" class="config">
+    <unit bldFile="genericpositioningplugins/rom"/>
+   </component>
+  </collection>
+  <collection id="landmarks" name="Landmarks" level="server">
+   <component id="locationlandmarks" filter="s60" name="Location Landmarks">
+    <unit bldFile="landmarks/locationlandmarks/group"/>
+   </component>
+  </collection>
+  <collection id="locationsystemui" name="Location System UI" level="if">
+   <component id="locationsysui" filter="s60" name="Location System UI">
+    <unit bldFile="locationsystemui/locationsysui/group"/>
+   </component>
+   <component id="qtlocationsysui" filter="s60" name="Location System Qt UI">
+    <unit bldFile="locationsystemui/locationsysui" qt:proFile="locsysui.pro"/>
+   </component>
+  </collection>
+  <collection id="supl" name="SUPL" level="fw">
+   <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+    <unit bldFile="supl/locationsuplfw/group"/>
+   </component>
+   <component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+    <unit bldFile="supl/locationomasuplprotocolhandler/group"/>
+   </component>
+   <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+    <unit bldFile="supl/supltiapiimplementation/group"/>
+   </component>
+  </collection>
+  <collection id="locationtriggering" name="Location Triggering" level="server">
+   <component id="ltlogger" filter="s60" name="LT Logger">
+    <unit bldFile="locationtriggering/ltlogger/group"/>
+   </component>
+   <component id="ltclientlib" filter="s60" name="LT Client Library">
+    <unit bldFile="locationtriggering/ltclientlib/group"/>
+   </component>
+   <component id="ltmanagementlib" filter="s60" name="LT Management Library">
+    <unit bldFile="locationtriggering/ltmanagementlib/group"/>
+   </component>
+   <component id="ltcontainer" filter="s60" name="LT Container">
+    <unit bldFile="locationtriggering/ltcontainer/group"/>
+   </component>
+   <component id="ltserver" filter="s60" name="LT Server">
+    <unit bldFile="locationtriggering/ltserver/group"/>
+   </component>
+   <component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+    <unit bldFile="locationtriggering/ltstrategypluginapi/group"/>
+   </component>
+   <component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+    <unit bldFile="locationtriggering/ltstrategyengine/group"/>
+   </component>
+   <component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+    <unit bldFile="locationtriggering/ltmovementdetectionpluginapi/group"/>
+   </component>
+   <component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+    <unit bldFile="locationtriggering/ltcellidmovementdetector/group"/>
+   </component>
+   <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+    <unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
+   </component>
+   <component id="locationtriggering_rom" filter="s60" name="Location Triggering ROM" class="config">
+    <unit bldFile="locationtriggering/rom"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>
+
diff -r 3efc7a0e8755 -r 24e118dfbea1 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Mon Aug 23 17:49:43 2010 +0530
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
diff -r 3efc7a0e8755 -r 24e118dfbea1 supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplstate.h
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplstate.h	Fri Aug 06 19:34:22 2010 +0530
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplstate.h	Mon Aug 23 17:49:43 2010 +0530
@@ -24,8 +24,6 @@
 #ifdef _DEBUG        
 #define PRINT_MESSAGE
 #endif        
-#define PRINT_MESSAGE
-//#undef PRINT_MESSAGE
 
 	/** 
 	MOMASuplMsgStateObserver Notifies about complaetion of operation with or without error.
diff -r 3efc7a0e8755 -r 24e118dfbea1 supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplstate.h
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplstate.h	Fri Aug 06 19:34:22 2010 +0530
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplstate.h	Mon Aug 23 17:49:43 2010 +0530
@@ -24,8 +24,6 @@
 #ifdef _DEBUG        
 #define PRINT_MESSAGE
 #endif        
-#define PRINT_MESSAGE
-//#undef PRINT_MESSAGE
 
 	/** 
 	MOMASuplMsgStateObserver Notifies about complaetion of operation with or without error.