TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename terminateKDE->terminateTDE

Browse Source
pull/16/head
Darrell Anderson 11 years ago
parent e4f16abb29
commit c4284606f6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

6
dcop/dcopserver.cpp
Unescape View File

@ -1290,10 +1290,10 @@ void DCOPServer::removeConnection( void* data )
void DCOPServer::slotTerminate() void DCOPServer::slotTerminate()
{ {
#ifndef NDEBUG #ifndef NDEBUG
fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateKDE signal." ); fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateTDE signal." );
#endif #endif
TQByteArray data; 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()) ); disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) ); connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) );
system(findDcopserverShutdown()+" --nokill"); system(findDcopserverShutdown()+" --nokill");
@ -1320,7 +1320,7 @@ void DCOPServer::slotShutdown()
{ {
shutdown = true; shutdown = true;
TQByteArray data; 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 m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate
disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) ); connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) );

2
kded/kded.cpp
Unescape View File

@ -770,7 +770,7 @@ public:
KDEDApplication() : KUniqueApplication( ) KDEDApplication() : KUniqueApplication( )
{ {
startup = true; startup = true;
dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()", dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()",
objId(), "quit()", false ); objId(), "quit()", false );
} }

10
tdeinit/tdelauncher.cpp
Unescape View File

@ -178,8 +178,8 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
dcopClient()->setNotifications( true ); dcopClient()->setNotifications( true );
connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)), connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)),
this, TQT_SLOT( slotAppRegistered( const TQCString &))); this, TQT_SLOT( slotAppRegistered( const TQCString &)));
dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()", dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()",
objId(), "terminateKDE()", false ); objId(), "terminateTDE()", false );
TQString prefix = locateLocal("socket", "tdelauncher"); TQString prefix = locateLocal("socket", "tdelauncher");
KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket")); KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
@ -405,11 +405,11 @@ TDELauncher::process(const TQCString &fun, const TQByteArray &data,
replyType = "void"; replyType = "void";
return true; return true;
} }
else if (fun == "terminateKDE()") else if (fun == "terminateTDE()")
{ {
::signal( SIGHUP, SIG_IGN); ::signal( SIGHUP, SIG_IGN);
::signal( SIGTERM, SIG_IGN); ::signal( SIGTERM, SIG_IGN);
kdDebug() << "TDELauncher::process ---> terminateKDE" << endl; kdDebug() << "TDELauncher::process ---> terminateTDE" << endl;
tdelauncher_header request_header; tdelauncher_header request_header;
request_header.cmd = LAUNCHER_TERMINATE_KDE; request_header.cmd = LAUNCHER_TERMINATE_KDE;
request_header.arg_length = 0; request_header.arg_length = 0;
@ -474,7 +474,7 @@ TDELauncher::functions()
funcs << "void waitForSlave(pid_t)"; funcs << "void waitForSlave(pid_t)";
funcs << "void setLaunchEnv(TQCString,TQCString)"; funcs << "void setLaunchEnv(TQCString,TQCString)";
funcs << "void reparseConfiguration()"; funcs << "void reparseConfiguration()";
// funcs << "void terminateKDE()"; // funcs << "void terminateTDE()";
funcs << "void autoStart()"; funcs << "void autoStart()";
funcs << "void autoStart(int)"; funcs << "void autoStart(int)";
return funcs; return funcs;

Write Preview
Loading…
Cancel
Save