diff -r f392bfb21e08 -r 9941bcf99348 gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp
--- a/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp	Wed Apr 14 16:15:29 2010 +0300
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp	Tue Apr 27 16:56:32 2010 +0300
@@ -156,7 +156,10 @@
         // Adding plugin data to lbx has a lot of CGSPluginInterface API calls.
         // -> A good place to use quarantine to catch panicking plugins in
         // any of these calls.
-        iGSWatchDog->QuarantineL( plugin->Id() );
+        #ifdef GS_ENABLE_WATCH_DOG
+            iGSWatchDog->QuarantineL( plugin->Id() );
+        #endif
+            
         if( plugin->Visible() )
             {
             AddPluginDataToLbxL( plugin,
@@ -164,7 +167,9 @@
                                  icons,
                                  iconCounter );
             }
-        iGSWatchDog->RemoveFromQuarantineL( plugin->Id() );
+        #ifdef GS_ENABLE_WATCH_DOG
+            iGSWatchDog->RemoveFromQuarantineL( plugin->Id() );
+        #endif
         }
 
     // 2) Replace old icon array if needed.