--- a/idlehomescreen/widgetmanager/src/wmplugin.cpp	Fri Feb 19 22:42:37 2010 +0200
+++ b/idlehomescreen/widgetmanager/src/wmplugin.cpp	Fri Mar 12 15:41:49 2010 +0200
@@ -57,11 +57,17 @@
 //
 CWmPlugin::~CWmPlugin()
     {
+    if ( iWmInstaller && 
+       iWmInstaller->IsActive() )
+        {
+        iWmInstaller->Cancel();
+        }
+
     // delete members
     delete iResourceLoader;
     delete iEffectManager;
     delete iPostponedContent;
-	delete iWmInstaller;
+    delete iWmInstaller;
     }
 
 // ---------------------------------------------------------
@@ -113,7 +119,7 @@
         {
         TRAP_IGNORE( 
             iEffectManager->BeginFullscreenEffectL( 
-                KAppStartCommonDefaultStyle );
+                KAppStartEffectStyle );
             iViewAppUi->ActivateLocalViewL( 
                 TUid::Uid( EWmMainContainerViewId ) );
             );
@@ -180,7 +186,7 @@
         iWmMainContainer->SetClosingDown( ETrue );
         TRAP_IGNORE( 
             iEffectManager->BeginFullscreenEffectL(
-                KAppExitCommonDefaultStyle );
+                KAppExitEffectStyle );
             iViewAppUi->ActivateLocalViewL(
                 iPreviousViewUid.iViewUid ); 
             );
@@ -287,24 +293,16 @@
         {
         case KHsErrorViewFull:
         case KHsErrorDoesNotFit:
+            // Not enough space to add new widget to active page. 
+            // Remove some content first.
             ResourceLoader().InfoPopupL(
                 R_QTN_HS_ADD_WIDGET_NO_SPACE_NOTE, KNullDesC );
             break;
-            
-        case KHsErrorMaxInstanceCountExceeded:
-            {
-            TInt resource = ( iPostponedContent->Type() == KContentTemplate ) ?
-                resource = R_QTN_HS_ADD_WIDGET_MAX_REACHED : // wrt
-                resource = R_QTN_HS_ADD_WIDGET_MAX_COUNT_NOTE; // native
-            
-            ResourceLoader().InfoPopupL( resource, KNullDesC );
+        case KErrNoMemory:
+            // Not enough memory to add more content. 
+            // Please remove some Homescreen content and try again.
+            ResourceLoader().InfoPopupL( R_QTN_HS_HS_MEMORY_FULL, KNullDesC ); 
             break;
-            }
-            
-        case KErrNoMemory:
-            ResourceLoader().InfoPopupL( R_QTN_HS_HS_MEMORY_FULL, KNullDesC );
-            break;
-            
         default:
             ResourceLoader().ErrorPopup( aError );
             break;