# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1277123120 -10800
# Node ID fda5a9396e07e600f60b19034287b3cb34d62a69
# Parent  6b620215f837e5726b428f06846f063c987300ac
Revision: 201023
Kit: 2010125

diff -r 6b620215f837 -r fda5a9396e07 imstutils/imconversationview/imcvuiengine/src/cimcvenginecchhandler.cpp
--- a/imstutils/imconversationview/imcvuiengine/src/cimcvenginecchhandler.cpp	Wed Jun 09 09:27:17 2010 +0300
+++ b/imstutils/imconversationview/imcvuiengine/src/cimcvenginecchhandler.cpp	Mon Jun 21 15:25:20 2010 +0300
@@ -329,7 +329,11 @@
 				// as user would loose all the on-going conversation when the network connection is
 				// restored.				
 				if (aServiceStatus.Error () != KCCHErrorNetworkLost )
-				iEngine.CloseAllOpenChatsL();
+				   {
+					iEngine.CloseAllOpenChatsL();
+					iEngine.ReleaseConnectionL ();
+					iEngine.DeleteContextL ();
+				   }
 				notifyEvent = MIMCVEngineCCHObserver::EDisconnecting;
 				break;	
 				}
diff -r 6b620215f837 -r fda5a9396e07 servicewidget/servicewidgetdatapublisher/src/cservicewidgetcchhandler.cpp
--- a/servicewidget/servicewidgetdatapublisher/src/cservicewidgetcchhandler.cpp	Wed Jun 09 09:27:17 2010 +0300
+++ b/servicewidget/servicewidgetdatapublisher/src/cservicewidgetcchhandler.cpp	Mon Jun 21 15:25:20 2010 +0300
@@ -517,6 +517,7 @@
 
     if( iCchClient  )
         {
+		iCchClient->SetConnectivityDialogsAllowed( ETrue );
         CCchService* service = iCchClient->GetService( iServiceId );
         if( service )
             {
diff -r 6b620215f837 -r fda5a9396e07 uiservicetab/vimpstcmdprocess/src/cvimpstprocessArray.cpp
--- a/uiservicetab/vimpstcmdprocess/src/cvimpstprocessArray.cpp	Wed Jun 09 09:27:17 2010 +0300
+++ b/uiservicetab/vimpstcmdprocess/src/cvimpstprocessArray.cpp	Mon Jun 21 15:25:20 2010 +0300
@@ -320,6 +320,10 @@
 
             if(iProcessObservers)
                 {
+                if (aContact->AvatarContent().Length())
+                    {
+                    iProcessObservers->HandleAvatarChangeL(aContact->UserId());
+                    }
                 /* passing aContactIndex so that the focus is on owndata item */
                 iProcessObservers->HandleAdditionL(TVIMPSTEnums::EContactItem, aContactIndex );
                 }