--- a/brandingserver/BSServer/cbsstoragemanager.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/brandingserver/BSServer/cbsstoragemanager.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -267,6 +267,7 @@
                   langBuf.Length() + KDot().Length() * 3 + KMaxVersionLenght;
 	fileName = HBufC::NewLC( length );
     
+    if(fileName){
     TPtr file( fileName->Des() );
 
     // [application_id]\[brand_id]\[def_filename][language_id]
@@ -286,11 +287,9 @@
 	    file.Append( KDot() );
     	file.Append( versionBuffer );
     	}
-
-    if( fileName )
-    	{
-    	CleanupStack::Pop( fileName );
-    	}
+    	
+    	CleanupStack::Pop( fileName );      
+    }
     return fileName;
     }
 

--- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -100,7 +100,8 @@
 			}
 	   case EIMOperationCompleted :
 	   		{
-	   		iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL );	
+	   		iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL );
+			break;	
 	   		}
 	    case EIMOperationChatStarted :
 		    {

--- a/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h	Sun Apr 11 15:33:49 2010 +0530
+++ b/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h	Fri Apr 16 23:09:29 2010 +0530
@@ -2,17 +2,17 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description:  Im Service Connection operation factory
- *
+* Description:  Interface for Search info object.
+*
 */
 
 

--- a/ximpfw/core/srcprocessor/ximphostimp.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/ximpfw/core/srcprocessor/ximphostimp.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -137,7 +137,8 @@
 
     for ( int i = 0;i < 5;i++ )
         {
-        iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) );
+        TInt Ret = iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) );
+        UNUSED_FORMAL_PARAM(Ret);	
         }
     
     iCallBack[ECompleteRequestCallback]->Set( TCallBack( CompleteRequestCallback, this ) );

--- a/ximpfw/core/srcprocessor/ximphostimp.h	Sun Apr 11 15:33:49 2010 +0530
+++ b/ximpfw/core/srcprocessor/ximphostimp.h	Fri Apr 16 23:09:29 2010 +0530
@@ -28,6 +28,7 @@
 #include "ximprequestidbuilder.h"
 
 
+
 class CXIMPOperationBase;
 class CXIMPEventManager;
 class MXIMPObjectFactory;
@@ -52,6 +53,8 @@
 class CProtocolPresenceDataHostImp;
 class MProtocolDataHost;
 
+#define UNUSED_FORMAL_PARAM(p) (void) p
+
 
 /**
  * Presence connection host.

--- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -137,10 +137,10 @@
 TInt CPresenceCacheServiceStore::AddBlind(CPresenceCacheBuddyStore* aBuddyStore)
     {
     TRACE( _L("CPresenceCacheServiceStore::AddBlind - begin") );
-    TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity()));
-    
-    if(!aBuddyStore)
-        return KErrArgument;
+    if(aBuddyStore)
+      TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity()));
+    else
+      return KErrArgument;
     
     iBuddyStoreCollection.Append(aBuddyStore);
     
@@ -163,13 +163,16 @@
                                             (MPresenceBuddyInfo* aBuddyPresInfo)
     {
     TRACE( _L("CPresenceCacheServiceStore::AddOrReplacePresence - begin") );
-    TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity()));
+    
     
     
     CPresenceCacheBuddyStore* newBuddyStore(NULL);
-    if(!aBuddyPresInfo)
-        return newBuddyStore;
-    
+    if(aBuddyPresInfo)
+      TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity()));
+    else
+    	{
+            return newBuddyStore;
+        }
     TBool oldPresExists(EFalse);
     
     TInt count = iBuddyStoreCollection.Count();

--- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -740,8 +740,11 @@
             CleanupStack::Pop(serviceStore);  
             }
         buddyStore = CPresenceCacheBuddyStore::NewLC(serviceStore,identity);
-        err = serviceStore->AddBlind(buddyStore); //ownership transferred
-        CleanupStack::Pop(buddyStore);
+        if(buddyStore)
+        	{
+        	err = serviceStore->AddBlind(buddyStore); //ownership transferred
+        	CleanupStack::Pop(buddyStore);
+        	}
         CleanupStack::Pop(identity);
         } 
     else

--- a/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -141,9 +141,10 @@
     MPresenceBuddyInfo* aPresenceBuddyInfo)
     {
     TRACE( _L("CPresenceBuddyInfoListImp::AddOrReplace - begin") );
-    TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity()));        
-    if(!aPresenceBuddyInfo)
-        return KErrArgument;
+    if(aPresenceBuddyInfo)
+    	TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity()));        
+    else
+    	return KErrArgument;
     
     if ( (ServiceName() != KNullDesC) && 
         (ExtractService( aPresenceBuddyInfo->BuddyId()->Identity()).Compare( ServiceName()) ))