# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401459 -7200
# Node ID 895b8e06c769de28bcebf955b479d3c39f3d64f7
# Parent  ca392eff71523a3370ed5fc11be08c77fb6c15c1
Revision: 201007
Kit: 201008

diff -r ca392eff7152 -r 895b8e06c769 XDMSettingsUI/src/XDMPluginContainer.cpp
--- a/XDMSettingsUI/src/XDMPluginContainer.cpp	Fri Feb 19 23:13:07 2010 +0200
+++ b/XDMSettingsUI/src/XDMPluginContainer.cpp	Fri Mar 12 15:44:19 2010 +0200
@@ -47,7 +47,7 @@
 //
 CXDMPluginContainer::CXDMPluginContainer(CAknView* aView) : iView(aView)
     {
-    
+    SetComponentsToInheritVisibility( ETrue );
     }
     
 // ---------------------------------------------------------------------------
diff -r ca392eff7152 -r 895b8e06c769 XDMSettingsUI/src/XDMPluginSLContainer.cpp
--- a/XDMSettingsUI/src/XDMPluginSLContainer.cpp	Fri Feb 19 23:13:07 2010 +0200
+++ b/XDMSettingsUI/src/XDMPluginSLContainer.cpp	Fri Mar 12 15:44:19 2010 +0200
@@ -55,6 +55,7 @@
 //
 CXDMPluginSLContainer::CXDMPluginSLContainer(CAknView* aView) : iView(aView)
     {
+    SetComponentsToInheritVisibility( ETrue );
     }
     
 // ---------------------------------------------------------------------------
diff -r ca392eff7152 -r 895b8e06c769 XDMSettingsUI/src/XDMPluginSettinglist.cpp
--- a/XDMSettingsUI/src/XDMPluginSettinglist.cpp	Fri Feb 19 23:13:07 2010 +0200
+++ b/XDMSettingsUI/src/XDMPluginSettinglist.cpp	Fri Mar 12 15:44:19 2010 +0200
@@ -64,6 +64,7 @@
     CAknSettingItemList(),
     iSettingsData(aData)  
     {
+    SetComponentsToInheritVisibility( ETrue );
     }
 
 // -----------------------------------------------------------------------------
diff -r ca392eff7152 -r 895b8e06c769 simpledatamodeladapter/src/presencepluginpublisher.cpp
--- a/simpledatamodeladapter/src/presencepluginpublisher.cpp	Fri Feb 19 23:13:07 2010 +0200
+++ b/simpledatamodeladapter/src/presencepluginpublisher.cpp	Fri Mar 12 15:44:19 2010 +0200
@@ -394,6 +394,11 @@
             iPublisher->StopPublishL();
             CompleteXIMPReq( KXIMPErrServicRequestTimeouted );
             }
+        else if( KErrCommsBreak == aStatus )
+            {
+            DP_SDA("PublishReqCompleteL KErrCommsBreak");
+            CompleteXIMPReq( KErrCommsBreak );
+            }
         else
         	{
         	//Set rePublish flag back to false.