Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: new KApplication::quitOnDisconnected() method, also setup quit signal handler by default

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-23 15:09:48 +02:00
parent 0f0db0c3a7
commit 38e370d475
4 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kded/kded.cpp
View file

@ -586,7 +586,6 @@ int main(int argc, char *argv[])
KApplication app; KApplication app;
app.setQuitOnLastWindowClosed(false); app.setQuitOnLastWindowClosed(false);
app.disableSessionManagement(); app.disableSessionManagement();
app.quitOnSignal();
QDBusConnection session = QDBusConnection::sessionBus(); QDBusConnection session = QDBusConnection::sessionBus();
if (!session.isConnected()) { if (!session.isConnected()) {

26
kdeui/kernel/kapplication.cpp
View file

@ -465,18 +465,13 @@ void KApplicationPrivate::init()
); );
} }
} }
// too late to restart if the application is about to quit (e.g. if QApplication::quit() was // too late to restart if the application is about to quit (e.g. if QApplication::quit() was
// called or SIGTERM was received) // called or SIGTERM was received)
q->connect(q, SIGNAL(aboutToQuit()), SLOT(_k_disableAutorestartSlot())); q->connect(q, SIGNAL(aboutToQuit()), SLOT(_k_disableAutorestartSlot()));
// TODO: static quitOnDisconnected() method for use with QCoreApplication/QApplication KApplication::quitOnSignal();
sessionBus.connect( KApplication::quitOnDisconnected();
QString(),
QString::fromLatin1("/org/freedesktop/DBus/Local"),
QString::fromLatin1("org.freedesktop.DBus.Local"),
QString::fromLatin1("Disconnected"),
q, SLOT(quit())
);
qRegisterMetaType<KUrl>(); qRegisterMetaType<KUrl>();
qRegisterMetaType<KUrl::List>(); qRegisterMetaType<KUrl::List>();
@ -826,6 +821,21 @@ void KApplication::quitOnSignal()
::sigprocmask(SIG_UNBLOCK, &handlermask, NULL); ::sigprocmask(SIG_UNBLOCK, &handlermask, NULL);
} }
void KApplication::quitOnDisconnected()
{
if (!qApp) {
kWarning(240) << "KApplication::quitOnDisconnected() called before application instance is created";
return;
}
QDBusConnection::sessionBus().connect(
QString(),
QString::fromLatin1("/org/freedesktop/DBus/Local"),
QString::fromLatin1("org.freedesktop.DBus.Local"),
QString::fromLatin1("Disconnected"),
qApp, SLOT(quit())
);
}
void KApplication::setTopWidget( QWidget *topWidget ) void KApplication::setTopWidget( QWidget *topWidget )
{ {
if( !topWidget ) if( !topWidget )

10
kdeui/kernel/kapplication.h
View file

@ -253,9 +253,19 @@ public:
/** /**
* Setups signal handler for SIGTERM, SIGHUP and SIGINT to call QApplication::quit() when such * Setups signal handler for SIGTERM, SIGHUP and SIGINT to call QApplication::quit() when such
* signal is received. * signal is received.
* @note By default KApplication constructor calls this static method, unless QCoreApplication
* or QApplication instance is used you should not call it.
*/ */
static void quitOnSignal(); static void quitOnSignal();
/**
* Connects D-Bus disconnected to QApplication::quit().
* @note By default KApplication constructor calls this static method, unless QCoreApplication
* or QApplication instance is used you should not call it.
* @since 4.23
*/
static void quitOnDisconnected();
#ifdef Q_WS_X11 #ifdef Q_WS_X11
/** /**
@internal @internal

1
kinit/klauncher.cpp
View file

@ -75,7 +75,6 @@ int main(int argc, char *argv[])
KApplication app; KApplication app;
app.setQuitOnLastWindowClosed(false); app.setQuitOnLastWindowClosed(false);
app.disableSessionManagement(); app.disableSessionManagement();
app.quitOnSignal();
QDBusConnection session = QDBusConnection::sessionBus(); QDBusConnection session = QDBusConnection::sessionBus();
if (!session.isConnected()) { if (!session.isConnected()) {