diff options
| -rw-r--r-- | dcop/dcopserver.cpp | 6 | ||||
| -rw-r--r-- | kded/kded.cpp | 2 | ||||
| -rw-r--r-- | tdeinit/tdelauncher.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index 136945c1e..15066047a 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -1290,10 +1290,10 @@ void DCOPServer::removeConnection( void* data ) void DCOPServer::slotTerminate() { #ifndef NDEBUG - fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateKDE signal." ); + fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateTDE signal." ); #endif TQByteArray data; - dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false); + dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) ); system(findDcopserverShutdown()+" --nokill"); @@ -1320,7 +1320,7 @@ void DCOPServer::slotShutdown() { shutdown = true; TQByteArray data; - dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false); + dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) ); diff --git a/kded/kded.cpp b/kded/kded.cpp index 16cbfa2ce..c7a0aa221 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -770,7 +770,7 @@ public: KDEDApplication() : KUniqueApplication( ) { startup = true; - dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()", + dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()", objId(), "quit()", false ); } diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp index 4bd80cb13..966a2ee45 100644 --- a/tdeinit/tdelauncher.cpp +++ b/tdeinit/tdelauncher.cpp @@ -178,8 +178,8 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup) dcopClient()->setNotifications( true ); connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)), this, TQT_SLOT( slotAppRegistered( const TQCString &))); - dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()", - objId(), "terminateKDE()", false ); + dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()", + objId(), "terminateTDE()", false ); TQString prefix = locateLocal("socket", "tdelauncher"); KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket")); @@ -405,11 +405,11 @@ TDELauncher::process(const TQCString &fun, const TQByteArray &data, replyType = "void"; return true; } - else if (fun == "terminateKDE()") + else if (fun == "terminateTDE()") { ::signal( SIGHUP, SIG_IGN); ::signal( SIGTERM, SIG_IGN); - kdDebug() << "TDELauncher::process ---> terminateKDE" << endl; + kdDebug() << "TDELauncher::process ---> terminateTDE" << endl; tdelauncher_header request_header; request_header.cmd = LAUNCHER_TERMINATE_KDE; request_header.arg_length = 0; @@ -474,7 +474,7 @@ TDELauncher::functions() funcs << "void waitForSlave(pid_t)"; funcs << "void setLaunchEnv(TQCString,TQCString)"; funcs << "void reparseConfiguration()"; -// funcs << "void terminateKDE()"; +// funcs << "void terminateTDE()"; funcs << "void autoStart()"; funcs << "void autoStart(int)"; return funcs; |