diff -r e0b83131558d -r 313976a11e23 controlpanelplugins/themeplugin/src/cpthemecontrol.cpp
--- a/controlpanelplugins/themeplugin/src/cpthemecontrol.cpp	Fri Jul 23 11:04:51 2010 +0800
+++ b/controlpanelplugins/themeplugin/src/cpthemecontrol.cpp	Thu Aug 05 11:28:29 2010 +0800
@@ -51,7 +51,7 @@
 #include <hblabel.h>
 
 //time out time before showing a processing dialog.
-static const int KThemeChangeTimeOutMilliSeconds = 1000;  
+static const int KThemeChangeTimeOutMilliSeconds = 2000;  
 
 /*!
 	Helper function to fetch the main window.
@@ -247,6 +247,7 @@
     }
     
     
+#ifdef CP_THEME_PREVIEW_DEFINED    
     
    //Set up the theme preview and set it to
     //the current view of main window.
@@ -268,6 +269,9 @@
     mThemePreview->setTitle(hbTrId("txt_cp_title_control_panel"));
 
     mWindow->setCurrentView(mThemePreview);
+#else
+    themeApplied(themeInfo);
+#endif
 
 }
 
@@ -288,8 +292,13 @@
         mThemeChangeFinished = false;
     } else {
         //theme change failed, go back to control panel.
+#ifdef CP_THEME_PREVIEW_DEFINED
         previewClosed();
         triggerThemeListClose();
+#else
+        setActiveThemeIndex();
+#endif
+   
     }
    
 }
@@ -343,12 +352,19 @@
     if(mWaitDialog && mWaitDialog->isVisible()) {
         mWaitDialog->hide();
     }
-    
-    previewClosed();
-    //ask the themelistview to close.  Control Panel will
-    //take care of removing it from window.
-    triggerThemeListClose();
-    
+   
+#ifdef CP_THEME_PREVIEW_DEFINED
+        previewClosed();
+        //ask the themelistview to close.  Control Panel will
+        //take care of removing it from window.
+        triggerThemeListClose();
+#else
+        setActiveThemeIndex();
+       
+#endif
+       
+
+  
     QThread::currentThread()->setPriority(QThread::NormalPriority); 
 }