# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1276066925 -10800
# Node ID cfe5eb8bb9ca45e24a2af23911f6b1f24c7dc20f
# Parent  7797b2f86d2bb20ff34920fa135bd90506b12eef
Revision: 201021
Kit: 2010123

diff -r 7797b2f86d2b -r cfe5eb8bb9ca brandingserver/bsserver/cbssession.cpp
--- a/brandingserver/bsserver/cbssession.cpp	Tue Apr 27 16:58:25 2010 +0300
+++ b/brandingserver/bsserver/cbssession.cpp	Wed Jun 09 10:02:05 2010 +0300
@@ -511,7 +511,8 @@
 		{
 			TRACE( T_LIT("CBSSession::InitUpdateL: Brand discarded!->LeaveWith KErrNotFound") );
 			///Server()->DisplaySessionInfoL( this, KErrNotFound );
-			User::Leave( KErrNotFound );	
+			//User::Leave( KErrNotFound );	
+			iBrandId->Des().Copy( *iDefaultBrandId );
 		}
 	}
 
diff -r 7797b2f86d2b -r cfe5eb8bb9ca brandingserver/sis/bsstub.pkg
--- a/brandingserver/sis/bsstub.pkg	Tue Apr 27 16:58:25 2010 +0300
+++ b/brandingserver/sis/bsstub.pkg	Wed Jun 09 10:02:05 2010 +0300
@@ -31,7 +31,7 @@
 &EN
 
 ;Header
-#{"BS"}, (0x102828DE), 1, 0, 0, TYPE=SA
+#{"BS"}, (0x102828DE), 1, 0, 0, TYPE=SA, RU
 
 
 ;Localised VendorID
@@ -41,7 +41,7 @@
 :"Nokia"
 
 ;binaries
-""-"!:\sys\bin\bsserver.exe"
-""-"!:\sys\bin\bsclient.dll"
+""-"z:\sys\bin\bsserver.exe"
+""-"z:\sys\bin\bsclient.dll"
 
 
diff -r 7797b2f86d2b -r cfe5eb8bb9ca brandingserver/sis/bsstub.sis
Binary file brandingserver/sis/bsstub.sis has changed
diff -r 7797b2f86d2b -r cfe5eb8bb9ca imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp
--- a/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp	Tue Apr 27 16:58:25 2010 +0300
+++ b/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp	Wed Jun 09 10:02:05 2010 +0300
@@ -560,7 +560,7 @@
 	{
 	// write the message into continuous memory stream
 	if( iAccessorInitialized  || 
-		iConvesationInitialized && aMsgHeader->IsChatStarted() )
+		iConvesationInitialized /*&& aMsgHeader->IsChatStarted()*/ )
 		{
 		ExternalizeSingleChatDataL(EIMOperationUnreadMessage, aMsgHeader, aMessage );
 		if( iObserverActive )