Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: use KApplication::quitOnSignal() in kglobaaccel, knotify4 and kuiserver to setup signals for application quit

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-26 02:44:21 +03:00
parent e47545edf0
commit 5927adc8c7
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kglobalaccel/main.cpp
View file

@ -68,6 +68,7 @@ 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()) {

1
knotify/main.cpp
View file

@ -54,6 +54,7 @@ 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()) {

24
ksmserver/server.cpp
View file

@ -46,7 +46,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif #endif
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
@ -65,7 +64,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <QRegExp> #include <QRegExp>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QSocketNotifier> #include <QSocketNotifier>
#include <QtCore/qfileinfo.h> #include <QtCore/QFileInfo>
#include <QtGui/qx11info_x11.h>
#include <kaction.h> #include <kaction.h>
#include <kactioncollection.h> #include <kactioncollection.h>
@ -81,13 +81,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kprocess.h> #include <kprocess.h>
#include <kdebug.h> #include <kdebug.h>
#include <kshell.h> #include <kshell.h>
#include "moc_server.cpp"
#include <kworkspace/kdisplaymanager.h> #include <kworkspace/kdisplaymanager.h>
#include <QtGui/qx11info_x11.h>
#include <krandom.h> #include <krandom.h>
#include <klauncher_iface.h> #include <klauncher_iface.h>
#include <kde_file.h>
KSMServer* the_server = 0; KSMServer* the_server = 0;
@ -706,10 +703,9 @@ KSMServer::KSMServer( const QString& windowManager, bool _only_local, bool locks
connect( con, SIGNAL(activated(int)), this, SLOT(newConnection(int)) ); connect( con, SIGNAL(activated(int)), this, SLOT(newConnection(int)) );
} }
signal(SIGHUP, sighandler); KDE_signal(SIGHUP, sighandler);
signal(SIGTERM, sighandler); KDE_signal(SIGTERM, sighandler);
signal(SIGINT, sighandler); KDE_signal(SIGINT, sighandler);
signal(SIGPIPE, SIG_IGN);
connect( &protectionTimer, SIGNAL(timeout()), this, SLOT(protectionTimeout()) ); connect( &protectionTimer, SIGNAL(timeout()), this, SLOT(protectionTimeout()) );
connect( &restoreTimer, SIGNAL(timeout()), this, SLOT(tryRestoreNext()) ); connect( &restoreTimer, SIGNAL(timeout()), this, SLOT(tryRestoreNext()) );
@ -743,14 +739,14 @@ void KSMServer::cleanUp()
::unlink(fName.data()); ::unlink(fName.data());
FreeAuthenticationData(numTransports, authDataEntries); FreeAuthenticationData(numTransports, authDataEntries);
signal(SIGTERM, SIG_DFL);
signal(SIGINT, SIG_DFL); KDE_signal(SIGTERM, SIG_DFL);
KDE_signal(SIGINT, SIG_DFL);
KDisplayManager().shutdown( shutdownType, shutdownMode ); KDisplayManager().shutdown( shutdownType, shutdownMode );
} }
void* KSMServer::watchConnection( IceConn iceConn ) void* KSMServer::watchConnection( IceConn iceConn )
{ {
KSMConnection* conn = new KSMConnection( iceConn ); KSMConnection* conn = new KSMConnection( iceConn );
@ -1067,3 +1063,5 @@ void KSMServer::rebootWithoutConfirmation()
{ {
shutdown(KWorkSpace::ShutdownConfirmNo, KWorkSpace::ShutdownTypeReboot, KWorkSpace::ShutdownModeDefault); shutdown(KWorkSpace::ShutdownConfirmNo, KWorkSpace::ShutdownTypeReboot, KWorkSpace::ShutdownModeDefault);
} }
#include "moc_server.cpp"

1
kuiserver/main.cpp
View file

@ -53,6 +53,7 @@ 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()) {