# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284541075 -10800
# Node ID ffa4311257f632ff2259af158ad874cd75e91c21
# Parent  2b4be3554d302974aeb183109f07292f56ef9919
Revision: 201035
Kit: 201036

diff -r 2b4be3554d30 -r ffa4311257f6 imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp
--- a/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp	Tue Sep 14 20:56:13 2010 +0300
+++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp	Wed Sep 15 11:57:55 2010 +0300
@@ -38,10 +38,17 @@
 // topleft and bottomright points of the first cell in the grid.
 // These co-ordinates to draw the grid lines and the logic to draw the grid lines is based on the topleft 
 // and bottomright points of the first cell in the grid.
+#define KTopLeft_x 28
+#define KTopLeft_y 55
+#define KBottomRight_x 88
+#define KBottomRight_y 120 //104
+
+/* Previous Value Since there are frequent changes in LAF 
 #define KTopLeft_x 56
 #define KTopLeft_y 55
 #define KBottomRight_x 105
 #define KBottomRight_y 104
+*/
 
 
 // ================= MEMBER FUNCTIONS =======================
diff -r 2b4be3554d30 -r ffa4311257f6 servicewidget/servicewidgetdatapublisher/src/cservicewidgetbrandhandler.cpp
--- a/servicewidget/servicewidgetdatapublisher/src/cservicewidgetbrandhandler.cpp	Tue Sep 14 20:56:13 2010 +0300
+++ b/servicewidget/servicewidgetdatapublisher/src/cservicewidgetbrandhandler.cpp	Wed Sep 15 11:57:55 2010 +0300
@@ -195,7 +195,7 @@
     //Fetching bitmaps from the server. 
     if(!iBrandingAccess)
         {
-        PrepareBrandingAccess();    
+        User::LeaveIfError(PrepareBrandingAccess());    
         }
     
     // EWSonline has to be at 0th in enums
diff -r 2b4be3554d30 -r ffa4311257f6 servicewidget/servicewidgetdatapublisher/src/cservicewidgetservicemanager.cpp
--- a/servicewidget/servicewidgetdatapublisher/src/cservicewidgetservicemanager.cpp	Tue Sep 14 20:56:13 2010 +0300
+++ b/servicewidget/servicewidgetdatapublisher/src/cservicewidgetservicemanager.cpp	Wed Sep 15 11:57:55 2010 +0300
@@ -199,7 +199,7 @@
 void CServiceWidgetServiceManager::UpdateContentsL()
     {
     TRACE_SWP(TXT("CServiceWidgetServiceManager::UpdateContentsL() start") );
-    if( !iIsWidgetSuspended )
+    if( !iIsWidgetSuspended && iCchHandler)
         {
         SetCurrentTextDataL(); // to set the data in box 2 and 4 : Own id and new message or invite or presence
         }