From aeddaec26618462b890896c75b714b764910184d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 20 Aug 2011 06:06:53 +0000 Subject: Use TDE_FULL_SESSION instead of KDE_FULL_SESSION git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1248149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kapplication.cpp | 2 +- kded/kded.cpp | 2 +- kdesu/process.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 91aa2a967..05afb3054 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -1311,7 +1311,7 @@ static void checkRestartVersion( TQSessionManager& sm ) int format; unsigned long nitems, after; unsigned char* data; - if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "KDE_FULL_SESSION", False ), + if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "TDE_FULL_SESSION", False ), 0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) { if( data != NULL ) XFree( data ); diff --git a/kded/kded.cpp b/kded/kded.cpp index 257ab3731..1d234ac06 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -156,7 +156,7 @@ void Kded::initModules() { m_dontLoad.clear(); KConfig *config = kapp->config(); - bool kde_running = !( getenv( "KDE_FULL_SESSION" ) == NULL || getenv( "KDE_FULL_SESSION" )[ 0 ] == '\0' ); + bool kde_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) if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid()) kde_running = false; diff --git a/kdesu/process.cpp b/kdesu/process.cpp index f5fb7d34e..d50e188f5 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -358,7 +358,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args) { putenv(const_cast(*it).data()); } - unsetenv("KDE_FULL_SESSION"); + unsetenv("TDE_FULL_SESSION"); // set temporarily LC_ALL to C, for su (to be able to parse "Password:") const char* old_lc_all = getenv( "LC_ALL" ); -- cgit v1.2.3