ksplash: remove now useless confupdate state

diff --git a/ksplash/README b/ksplash/README
index e69614a..540827a 100644 (file)
--- a/ksplash/README
+++ b/ksplash/README
@@ -48,7 +48,6 @@ Startup states:
 These are ksplash states:
 - initial - at the beginning
 - kded - after kded is running (dbus is ready, etc.)
-- confupdate - after kconf_update (settings updated after upgrade, etc.)
 - kcminit - after configuration setup
 - ksmserver - session manager is started
 - wm - window manager is running

diff --git a/ksplash/ksplashqml/SplashApp.cpp b/ksplash/ksplashqml/SplashApp.cpp
index 8b76e78..fc6f9ec 100644 (file)
--- a/ksplash/ksplashqml/SplashApp.cpp
+++ b/ksplash/ksplashqml/SplashApp.cpp
@@ -89,16 +89,14 @@ bool SplashApp::x11EventFilter(XEvent * xe)
                     stage = 0; // not actually used
                 else if (strcmp(message, "kded") == 0 && m_stage < 1)
                     stage = 1;
-                else if (strcmp(message, "confupdate") == 0 && m_stage < 2)
+                else if (strcmp(message, "kcminit") == 0 && m_stage < 2)
                     stage = 2;
-                else if (strcmp(message, "kcminit") == 0 && m_stage < 3)
+                else if (strcmp(message, "ksmserver") == 0 && m_stage < 3)
                     stage = 3;
-                else if (strcmp(message, "ksmserver") == 0 && m_stage < 4)
+                else if (strcmp(message, "wm") == 0 && m_stage < 4)
                     stage = 4;
-                else if (strcmp(message, "wm") == 0 && m_stage < 5)
+                else if (strcmp(message, "desktop") == 0 && m_stage < 5)
                     stage = 5;
-                else if (strcmp(message, "desktop") == 0 && m_stage < 6)
-                    stage = 6;
 
                 setStage(stage);
             }

diff --git a/ksplash/ksplashx/splash.cpp b/ksplash/ksplashx/splash.cpp
index d1c0c81..f8bc86b 100644 (file)
--- a/ksplash/ksplashx/splash.cpp
+++ b/ksplash/ksplashx/splash.cpp
@@ -25,10 +25,10 @@ const int ANIM_IMAGES_ROW = 10;
 
 // for converting from startup states to (internal) numbers
 // these are also in the simple splash and in krunner
-const char states[][ 12 ] =
-    { "initial", "kded", "confupdate", "kcminit", "ksmserver", "wm", "desktop", "ready" };
+const char states[][ 11 ] =
+    { "initial", "kded", "kcminit", "ksmserver", "wm", "desktop", "ready" };
 // State "ready" isn't used, make splash go away as soon as desktop is ready.
-const int LAST_STATE = 6;
+const int LAST_STATE = 5;
 
 extern int screen_number;