# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1263839584 -7200
# Node ID 89455bbf90d82802c1f036ed710bb42c0b178228
# Parent  b610b446cb01a44461b3edfad2da7f016af39f06
Revision: 201001
Kit: 201003

diff -r b610b446cb01 -r 89455bbf90d8 brandingserver/bsserver/cbsbrandhandler.cpp
--- a/brandingserver/bsserver/cbsbrandhandler.cpp	Thu Jan 07 12:56:16 2010 +0200
+++ b/brandingserver/bsserver/cbsbrandhandler.cpp	Mon Jan 18 20:33:04 2010 +0200
@@ -210,6 +210,7 @@
 	if (iLanguage >= 100)
 		User::LeaveIfError (KErrNotFound);
 	HBufC* fileName = GetTextL( aId );
+	CleanupStack :: PushL (fileName);
 
     TBuf<KLangBufLength> buffer;
 // append leading zero only if language code is <10.
@@ -239,6 +240,8 @@
 		TRACE( T_LIT( "CBSBrandHandler::GetFileL found in default brand") );
 	    
 	    }
+	
+	CleanupStack :: PopAndDestroy (fileName);
 
 	aFile = file;
     TRACE( T_LIT( "CBSBrandHandler::GetFileL end") );
diff -r b610b446cb01 -r 89455bbf90d8 brandingserver/bsserver/cbsstoragemanager.cpp
--- a/brandingserver/bsserver/cbsstoragemanager.cpp	Thu Jan 07 12:56:16 2010 +0200
+++ b/brandingserver/bsserver/cbsstoragemanager.cpp	Mon Jan 18 20:33:04 2010 +0200
@@ -900,6 +900,9 @@
 		CDir* directories = NULL;
 		
 		User::LeaveIfError( iFs.GetDir( driveAndPath, KEntryAttNormal, ESortByName, files, directories ) );
+
+		CleanupStack :: PushL (files);
+		CleanupStack :: PushL (directories);
 		
 		TInt count = files->Count();
 		for( TInt i = 0; i < count; i++ )
@@ -937,7 +940,10 @@
 				}
 			CleanupStack::PopAndDestroy( fullName );
 			}
-		CleanupStack::PopAndDestroy( nameWithDrive );
+		
+		CleanupStack :: PopAndDestroy (directories);
+		CleanupStack :: PopAndDestroy (files);
+		CleanupStack :: PopAndDestroy (nameWithDrive);
 		}
 	TRACE( T_LIT( "CBSStorageManager::CleanupFileL end") );
 	}
diff -r b610b446cb01 -r 89455bbf90d8 imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp
--- a/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp	Thu Jan 07 12:56:16 2010 +0200
+++ b/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp	Mon Jan 18 20:33:04 2010 +0200
@@ -597,6 +597,7 @@
 		}
 	else if( iObserverActive && iAccessorInitialized  )
 		{
+        ExternalizeSingleChatItemL(aChangeType, aMsgHeader );
 		iObserverMessage.Complete( EIMOperationUnreadChange );
 		iObserverActive = EFalse;		
 		}
diff -r b610b446cb01 -r 89455bbf90d8 imservices/xmppsettingsapi/group/bld.inf
--- a/imservices/xmppsettingsapi/group/bld.inf	Thu Jan 07 12:56:16 2010 +0200
+++ b/imservices/xmppsettingsapi/group/bld.inf	Mon Jan 18 20:33:04 2010 +0200
@@ -28,6 +28,8 @@
 1020E334.txt                					 /epoc32/data/Z/private/10202be9/1020E334.txt				//temporary
 1020E334.txt                					 /epoc32/release/winscw/udeb/Z/private/10202be9/1020E334.txt	//temporary
 
+1020E334.txt                					 /epoc32/release/winscw/urel/Z/private/10202be9/1020E334.txt	//temporary
+
 
 PRJ_MMPFILES
 xmppsettingsapi.mmp
diff -r b610b446cb01 -r 89455bbf90d8 ximpfw/core/srcprocessor/ximpcontexteventqueue.cpp
--- a/ximpfw/core/srcprocessor/ximpcontexteventqueue.cpp	Thu Jan 07 12:56:16 2010 +0200
+++ b/ximpfw/core/srcprocessor/ximpcontexteventqueue.cpp	Mon Jan 18 20:33:04 2010 +0200
@@ -244,7 +244,10 @@
         }
     else
         {
-        User::LeaveIfError(iNextEventToGo->Open()); //Open always return KErrNone.            
+        if(iNextEventToGo)
+         {
+         User::LeaveIfError(iNextEventToGo->Open()); //Open always return KErrNone.      
+         }              
         }
     }