diff -r 4a9568303383 -r f5dfdd5e4a1b controlpanelplugins/themeplugin/src/cpthemecontrol.h
--- a/controlpanelplugins/themeplugin/src/cpthemecontrol.h	Fri Jun 11 13:39:17 2010 +0300
+++ b/controlpanelplugins/themeplugin/src/cpthemecontrol.h	Wed Jun 23 18:13:38 2010 +0300
@@ -20,7 +20,6 @@
 
 #include <QObject>
 #include <QList>
-#include <QTimer>
 
 #include "cpthemechanger.h"
 #include <hbicon.h>
@@ -31,6 +30,7 @@
 class QSortFilterProxyModel;
 QT_END_NAMESPACE
 
+class HbDialog;
 class CpThemeListView;
 class CpThemePreview;
 class CpBaseSettingView;
@@ -57,6 +57,7 @@
     void themeApplied(const QString& theme);
     void themeListClosed();
     void themeChangeTimeout();
+    void themeWaitTimeout();
     void themeChangeFinished();
 
 private:
@@ -70,7 +71,8 @@
     CpThemeChanger* mThemeChanger;
     QAbstractItemModel* mListModel;
     QSortFilterProxyModel* mSortModel;
-    QTimer* mIdleTimer;
+    bool mThemeChangeFinished;
+    HbDialog* mWaitDialog;
 };
 
 #endif //CPTHEMECONTROL_H