summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-11-01 23:43:47 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-11-02 00:20:29 +0900
commit753410778bb37e179b6594d624ea7bdf82481352 (patch)
tree1835fb909c7170273849312f549114e161f127bd /ksmserver
parentc2c81633882a749bfe15f0d195cd074ecc4d2e0a (diff)
downloadtdebase-753410778bb37e179b6594d624ea7bdf82481352.tar.gz
tdebase-753410778bb37e179b6594d624ea7bdf82481352.zip
Conversion startkde -> starttde, exitkde -> exittde in r14-xdg-upd file and related usage in code. This resolves bug 2282 and 2283.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit b854e365affbc01f61f6a3f58347847437883953)
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/shutdown.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index a40bffc3b..a4a51779e 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -807,7 +807,7 @@ void KSMServer::completeShutdownOrCheckpoint()
waitForKNotify = false;
}
// event() can return -1 if KNotifyClient short-circuits and avoids KNotify
- logoutSoundEvent = KNotifyClient::event( 0, "exitkde" ); // KDE says good bye
+ logoutSoundEvent = KNotifyClient::event( 0, "exittde" ); // TDE says good bye
if( logoutSoundEvent <= 0 ) {
waitForKNotify = false;
}
@@ -1008,8 +1008,8 @@ void KSMServer::notifySlot(TQString event ,TQString app,TQString,TQString,TQStri
SHUTDOWN_MARKER("notifySlot state != WaitingForKNotify");
return;
}
- if( event != "exitkde" || app != "ksmserver" ) {
- SHUTDOWN_MARKER("notifySlot event != \"exitkde\" || app != \"ksmserver\"");
+ if( event != "exittde" || app != "ksmserver" ) {
+ SHUTDOWN_MARKER("notifySlot event != \"exittde\" || app != \"ksmserver\"");
return;
}
if( present & KNotifyClient::Sound ) { // logoutSoundFinished() will be called