mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-24 02:42:50 +00:00
generic: adjust to KApplication changes
KApplication::quitOnSignal() is now called from KApplication constructor Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
9ecb90f238
commit
c6d63798cf
6 changed files with 0 additions and 7 deletions
|
@ -68,7 +68,6 @@ int main(int argc, char **argv)
|
||||||
// This app is started automatically, no need for session management
|
// This app is started automatically, no need for session management
|
||||||
app.disableSessionManagement();
|
app.disableSessionManagement();
|
||||||
app.setQuitOnLastWindowClosed(false);
|
app.setQuitOnLastWindowClosed(false);
|
||||||
app.quitOnSignal();
|
|
||||||
|
|
||||||
QDBusConnection session = QDBusConnection::sessionBus();
|
QDBusConnection session = QDBusConnection::sessionBus();
|
||||||
if (!session.isConnected()) {
|
if (!session.isConnected()) {
|
||||||
|
|
|
@ -57,7 +57,6 @@ int main(int argc, char **argv)
|
||||||
// in which case there is a deadlock with ksmserver waiting for knotify to finish
|
// in which case there is a deadlock with ksmserver waiting for knotify to finish
|
||||||
// startup and knotify waiting to register with ksmserver
|
// startup and knotify waiting to register with ksmserver
|
||||||
app.disableSessionManagement();
|
app.disableSessionManagement();
|
||||||
app.quitOnSignal();
|
|
||||||
|
|
||||||
QDBusConnection session = QDBusConnection::sessionBus();
|
QDBusConnection session = QDBusConnection::sessionBus();
|
||||||
if (!session.isConnected()) {
|
if (!session.isConnected()) {
|
||||||
|
|
|
@ -229,8 +229,6 @@ int main( int argc, char* argv[] )
|
||||||
|
|
||||||
KSMServer *server = new KSMServer( wm, only_local, args->isSet("lockscreen") );
|
KSMServer *server = new KSMServer( wm, only_local, args->isSet("lockscreen") );
|
||||||
|
|
||||||
KApplication::quitOnSignal();
|
|
||||||
|
|
||||||
KCrash::setFlags(KCrash::Backtrace);
|
KCrash::setFlags(KCrash::Backtrace);
|
||||||
|
|
||||||
// for the KDE-already-running check in startkde
|
// for the KDE-already-running check in startkde
|
||||||
|
|
|
@ -20,7 +20,6 @@ int main(int argc, char *argv[])
|
||||||
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
|
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
|
||||||
|
|
||||||
KApplication a;
|
KApplication a;
|
||||||
KApplication::quitOnSignal();
|
|
||||||
KIconLoader::global()->addAppDir("ksmserver");
|
KIconLoader::global()->addAppDir("ksmserver");
|
||||||
qAddPostRoutine(KSMShutdownFeedback::stop);
|
qAddPostRoutine(KSMShutdownFeedback::stop);
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,6 @@ int main(int argc, char **argv)
|
||||||
// This app is started automatically, no need for session management
|
// This app is started automatically, no need for session management
|
||||||
app.disableSessionManagement();
|
app.disableSessionManagement();
|
||||||
app.setQuitOnLastWindowClosed(false);
|
app.setQuitOnLastWindowClosed(false);
|
||||||
app.quitOnSignal();
|
|
||||||
|
|
||||||
QDBusConnection session = QDBusConnection::sessionBus();
|
QDBusConnection session = QDBusConnection::sessionBus();
|
||||||
if (!session.isConnected()) {
|
if (!session.isConnected()) {
|
||||||
|
|
|
@ -248,7 +248,6 @@ bool Application::setup()
|
||||||
}
|
}
|
||||||
connect(owner, SIGNAL(lostOwnership()), this, SLOT(lostSelection()), Qt::DirectConnection);
|
connect(owner, SIGNAL(lostOwnership()), this, SLOT(lostSelection()), Qt::DirectConnection);
|
||||||
|
|
||||||
KApplication::quitOnSignal();
|
|
||||||
KCrash::setFlags(KCrash::AutoRestart);
|
KCrash::setFlags(KCrash::AutoRestart);
|
||||||
|
|
||||||
initting = true; // Startup...
|
initting = true; // Startup...
|
||||||
|
|
Loading…
Add table
Reference in a new issue