Quellcode durchsuchen

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-ecb5cbfe19
tags/v3.5.13
tpearson vor 7 Jahren
Ursprung
Commit
aeddaec266
3 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 1
    1
      kdecore/kapplication.cpp
  2. 1
    1
      kded/kded.cpp
  3. 1
    1
      kdesu/process.cpp

+ 1
- 1
kdecore/kapplication.cpp Datei anzeigen

@@ -1311,7 +1311,7 @@ static void checkRestartVersion( TQSessionManager& sm )
1311 1311
     int format;
1312 1312
     unsigned long nitems, after;
1313 1313
     unsigned char* data;
1314
-    if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "KDE_FULL_SESSION", False ),
1314
+    if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "TDE_FULL_SESSION", False ),
1315 1315
         0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
1316 1316
         if( data != NULL )
1317 1317
             XFree( data );

+ 1
- 1
kded/kded.cpp Datei anzeigen

@@ -156,7 +156,7 @@ void Kded::initModules()
156 156
 {
157 157
      m_dontLoad.clear();
158 158
      KConfig *config = kapp->config();
159
-     bool kde_running = !( getenv( "KDE_FULL_SESSION" ) == NULL || getenv( "KDE_FULL_SESSION" )[ 0 ] == '\0' );
159
+     bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
160 160
     // not the same user like the one running the session (most likely we're run via sudo or something)
161 161
     if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid())
162 162
         kde_running = false;

+ 1
- 1
kdesu/process.cpp Datei anzeigen

@@ -358,7 +358,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
358 358
     {
359 359
         putenv(const_cast<TQCString&>(*it).data());
360 360
     }
361
-    unsetenv("KDE_FULL_SESSION");
361
+    unsetenv("TDE_FULL_SESSION");
362 362
     
363 363
     // set temporarily LC_ALL to C, for su (to be able to parse "Password:")
364 364
     const char* old_lc_all = getenv( "LC_ALL" );

Laden…
Abbrechen
Speichern