--- a/locationtriggering/tsrc/lbtengine_test/UpdateTrigger/src/UpdateTriggerBlocks.cpp	Fri Jul 23 19:40:48 2010 +0530
+++ b/locationtriggering/tsrc/lbtengine_test/UpdateTrigger/src/UpdateTriggerBlocks.cpp	Fri Aug 06 19:34:22 2010 +0530
@@ -1299,22 +1299,17 @@
      /***************Another process Creating a trigger************/
      	 iLog->Log(_L("Before Create Trigger"));
      _LIT( KFilename,"CreateTest.exe" );
-    RProcess proc;
-    TInt retVal =proc.Create(KFilename,KNullDesC);
-    if(retVal == KErrNone)
-	{
-		proc.Resume();
-		TRequestStatus status = KRequestPending;
-		proc.Rendezvous(status);
-		User::WaitForRequest(status);
-	}	
-    iLog->Log(_L("Trigger Created"));
-    TInt triggerId=0;
-    RProperty iProperty;
-    User::LeaveIfError(iProperty.Get(
-        KPSUidTriggerIdInfo, 
-        KLbttesttriggerid, 
-        triggerId));
+     RProcess proc;
+     TInt retVal =proc.Create(KFilename,KNullDesC);
+     TInt triggerId = KLbtNullTriggerId;
+     if(retVal == KErrNone)
+         {
+         proc.Resume();
+         TRequestStatus status = KRequestPending;
+         proc.Rendezvous(status);
+         User::WaitForRequest(status);
+         triggerId = status.Int();
+         }   
       
      /***************************End*******************************/
  	     
@@ -1386,20 +1381,15 @@
      _LIT( KFilename,"CreateTest.exe" );
     RProcess proc;
     TInt retVal =proc.Create(KFilename,KNullDesC);
+    
     if(retVal == KErrNone)
-	{
+        {
 		proc.Resume();
 		TRequestStatus status = KRequestPending;
 		proc.Rendezvous(status);
 		User::WaitForRequest(status);
-	}	
+	    }	
     iLog->Log(_L("Trigger Created"));
-    TInt triggerId=0;
-    RProperty iProperty;
-    User::LeaveIfError(iProperty.Get(
-        KPSUidTriggerIdInfo, 
-        KLbttesttriggerid, 
-        triggerId));
         
      	  //Construct a session trigger
     CLbtSessionTrigger* trig = CLbtSessionTrigger::NewL();
@@ -1598,7 +1588,7 @@
     User::LeaveIfError( lbt.Open( lbtserver ) );
     CleanupClosePushL( lbt );
  	 
-    lbt.DeleteTriggersL();
+    TRAP_IGNORE(lbt.DeleteTriggersL());
     
     	  //Construct a session trigger
     CLbtSessionTrigger* trig = CLbtSessionTrigger::NewL();
@@ -1722,7 +1712,7 @@
     CleanupClosePushL( lbtserver );
     User::LeaveIfError( lbt.Open( lbtserver ) );
     CleanupClosePushL( lbt );
- 	  lbt.DeleteTriggersL();
+ 	TRAP_IGNORE( lbt.DeleteTriggersL() );
       	  //Construct a session trigger
     CLbtSessionTrigger* trig = CLbtSessionTrigger::NewL();
     
@@ -5263,22 +5253,17 @@
      /***************Another process Creating a trigger************/
      	 iLog->Log(_L("Before Create Trigger"));
      _LIT( KFilename,"CreateTest.exe" );
-    RProcess proc;
-    TInt retVal =proc.Create(KFilename,KNullDesC);
-    if(retVal == KErrNone)
-	{
-		proc.Resume();
-		TRequestStatus status = KRequestPending;
-		proc.Rendezvous(status);
-		User::WaitForRequest(status);
-	}	
-    iLog->Log(_L("Trigger Created"));
-    TInt triggerId=0;
-    RProperty iProperty;
-    User::LeaveIfError(iProperty.Get(
-        KPSUidTriggerIdInfo, 
-        KLbttesttriggerid, 
-        triggerId));
+     RProcess proc;
+     TInt retVal =proc.Create(KFilename,KNullDesC);
+     TInt triggerId = KLbtNullTriggerId;
+     if(retVal == KErrNone)
+         {
+         proc.Resume();
+         TRequestStatus status = KRequestPending;
+         proc.Rendezvous(status);
+         User::WaitForRequest(status);
+         triggerId = status.Int();
+         }   
       
      /***************************End*******************************/
  	 	 TCoordinate coordinate(62.5285,23.9385);