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
v3.5.13-sru
tpearson 13 年前
父節點 9a8ee04e39
當前提交 aeddaec266

@ -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 );

@ -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;

@ -358,7 +358,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
{
putenv(const_cast<TQCString&>(*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" );

載入中…
取消
儲存