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

Fix "KDE4 is running" message.

Browse Source 
This resolves bug report 1200.
(cherry picked from commit 3dfc6fd192)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 0e50dbcabd
commit f42aed592a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

20
kded/kded.cpp
Unescape View File

@ -156,17 +156,19 @@ void Kded::initModules()
{ {
m_dontLoad.clear(); m_dontLoad.clear();
KConfig *config = kapp->config(); KConfig *config = kapp->config();
bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' ); bool tde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
// not the same user like the one running the session (most likely we're run via sudo or something) // not the same user like the one running the session (most likely we're run via sudo or something)
if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid()) if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid())
kde_running = false; tde_running = false;
// Preload kded modules. // Preload kded modules.
KService::List kdedModules = KServiceType::offers("KDEDModule"); KService::List kdedModules = KServiceType::offers("KDEDModule");
TQString version = getenv( "KDE_SESSION_VERSION" ); TQString version = getenv( "KDE_SESSION_VERSION" );
TQStringList blacklist; TQStringList blacklist;
if ( version >= "4" ) if ( !(version == NULL) && version >= "4" )
{ {
kdDebug(7020) << "KDE4 is running." << endl; kdDebug(7020) << "KDE4 is running:" << endl;
kdDebug(7020) << " KDE_SESSION_VERSION: " << version << endl;
kdDebug(7020) << " Blacklisting mediamanager, medianotifier, kmilod, kwrited." << endl;
blacklist << "mediamanager" << "medianotifier" << "kmilod" << "kwrited"; blacklist << "mediamanager" << "medianotifier" << "kmilod" << "kwrited";
} }
for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it) for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
@ -193,11 +195,11 @@ void Kded::initModules()
{ {
case 0: // always autoload case 0: // always autoload
break; break;
case 1: // autoload only in KDE case 1: // autoload only in TDE
if( !kde_running ) if( !tde_running )
prevent_autoload = true; prevent_autoload = true;
break; break;
case 2: // autoload delayed, only in KDE case 2: // autoload delayed, only in TDE
default: default:
prevent_autoload = true; prevent_autoload = true;
break; break;
@ -207,7 +209,7 @@ void Kded::initModules()
} }
else else
{ {
if (autoload && kde_running) if (autoload && tde_running)
loadModule(service, false); loadModule(service, false);
} }
bool dontLoad = false; bool dontLoad = false;
@ -918,7 +920,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
if (!KUniqueApplication::start()) if (!KUniqueApplication::start())
{ {
fprintf(stderr, "[kded] KDE Daemon (kded) already running.\n"); fprintf(stderr, "[kded] Daemon (kded) is already running.\n");
exit(0); exit(0);
} }

Write Preview
Loading…
Cancel
Save