yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

suspend ksmserver's startup during kwin's startup too,

Browse source 
just in case, to make sure kwin is really ready before other
desktop components


svn path=/trunk/KDE/kdebase/workspace/; revision=1137061
This commit is contained in:
Luboš Luňák 2010-06-11 14:26:41 +00:00
parent 3f10840169
commit fd0a31c3bf
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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})

8
main.cpp
View file

@ -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" );