|
|
|
|
@ -23,11 +23,11 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org> |
|
|
|
|
#include <stdio.h> |
|
|
|
|
#include <stdlib.h> |
|
|
|
|
#include <signal.h> |
|
|
|
|
// #define INT8 _X11INT8
|
|
|
|
|
// #define INT32 _X11INT32
|
|
|
|
|
#define INT8 _X11INT8 |
|
|
|
|
#define INT32 _X11INT32 |
|
|
|
|
#include <X11/Xproto.h> |
|
|
|
|
// #undef INT8
|
|
|
|
|
// #undef INT32
|
|
|
|
|
#undef INT8 |
|
|
|
|
#undef INT32 |
|
|
|
|
|
|
|
|
|
#include <kcmdlineargs.h> |
|
|
|
|
#include <kaboutdata.h> |
|
|
|
|
@ -46,7 +46,7 @@ static void crashHandler(int) |
|
|
|
|
{ |
|
|
|
|
KCrash::setCrashHandler(0); // Exit on next crash.
|
|
|
|
|
delete client; client = 0; // Unregister with dcop.
|
|
|
|
|
// system("kwin&"); // Try to restart
|
|
|
|
|
system("kwin&"); // Try to restart
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int x11ErrorHandler(Display *d, XErrorEvent *e){ |
|
|
|
|
@ -179,7 +179,7 @@ void Application::saveState( QSessionManager& sm ) |
|
|
|
|
sm.requestPhase2(); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
workspaces.first()->storeSession( kapp->sessionConfig() ); |
|
|
|
|
kapp->sessionConfig()->sync(); |
|
|
|
|
} |
|
|
|
|
@ -210,7 +210,7 @@ int main( int argc, char * argv[] ) |
|
|
|
|
signal(SIGHUP, SIG_IGN); |
|
|
|
|
|
|
|
|
|
Application a; |
|
|
|
|
// KCrash::setCrashHandler(crashHandler); // Try to restart on crash
|
|
|
|
|
KCrash::setCrashHandler(crashHandler); // Try to restart on crash
|
|
|
|
|
fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1); |
|
|
|
|
|
|
|
|
|
client = a.dcopClient(); |
|
|
|
|
|