From fd0a31c3bfeb89b28920291d2fcbc5b49df5848d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Fri, 11 Jun 2010 14:26:41 +0000
Subject: [PATCH] suspend ksmserver's startup during kwin's startup too, just
 in case, to make sure kwin is really ready before other desktop components

svn path=/trunk/KDE/kdebase/workspace/; revision=1137061
---
 CMakeLists.txt | 3 +++
 main.cpp       | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86684544d2..b7fc9b942f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,9 @@ set(kwin_KDEINIT_SRCS
 
 qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace )
 
+qt4_add_dbus_interface( kwin_KDEINIT_SRCS
+  ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface)
+
 qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
 
 kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
diff --git a/main.cpp b/main.cpp
index 557c87fff5..0d36a9e077 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kxerrorhandler.h>
 #include <kdefakes.h>
 #include <QtDBus/QtDBus>
-
+#include <stdlib.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -48,12 +48,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KComboBox>
 #include <QVBoxLayout>
 
+#include <ksmserver_interface.h>
+
 #include "atoms.h"
 #include "options.h"
 #include "sm.h"
 #include "utils.h"
 #include "effects.h"
-#include <stdlib.h>
 
 #define INT8 _X11INT8
 #define INT32 _X11INT32
@@ -500,7 +501,10 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     // HACK: this is needed to work around a Qt4.4.0RC1 bug (#157659)
     setenv( "QT_SLOW_TOPLEVEL_RESIZE", "1", true );
 
+    org::kde::KSMServerInterface ksmserver( "org.kde.ksmserver", "/KSMServer", QDBusConnection::sessionBus());
+    ksmserver.suspendStartup( "kwin" );
     KWin::Application a;
+    ksmserver.resumeStartup( "kwin" );
     KWin::SessionManager weAreIndeed;
     KWin::SessionSaveDoneHelper helper;
     KGlobal::locale()->insertCatalog( "kwin_effects" );