diff options
| -rw-r--r-- | doc/userguide/kde-for-admins.docbook | 2 | ||||
| -rw-r--r-- | konqueror/konq_mainwindow.cc | 2 | ||||
| -rw-r--r-- | startkde | 26 |
3 files changed, 15 insertions, 15 deletions
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index a44055ca3..b3e0c9126 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -1239,7 +1239,7 @@ locale.</para> </listitem> </varlistentry> -<varlistentry><term>$<envar>KDE_FULL_SESSION</envar></term><listitem><para> +<varlistentry><term>$<envar>TDE_FULL_SESSION</envar></term><listitem><para> (Since &kde; 3.2) Automatically set to true by &kde; startup, it is used by ⪚ &konqueror; to know if it should consider remaining in memory for future re-use when being closed. If not set, &konqueror; will exit diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 7cc4877b2..6390c2652 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -5854,7 +5854,7 @@ bool KonqMainWindow::stayPreloaded() if( mainWindowList()->count() > 1 ) return false; // not running in full KDE environment? - if( getenv( "KDE_FULL_SESSION" ) == NULL || getenv( "KDE_FULL_SESSION" )[ 0 ] == '\0' ) + if( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' ) return false; // 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()) @@ -521,27 +521,27 @@ if test -z "$dl"; then fi # Mark that full KDE session is running (e.g. Konqueror preloading works only -# with full KDE running). The KDE_FULL_SESSION property can be detected by +# with full KDE running). The TDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION +# directly from the KDE session but e.g. using "ssh -X", kdesu. $TDE_FULL_SESSION # however guarantees that the application is launched in the same environment # like the KDE session and that e.g. KDE utilities/libraries are available. -# KDE_FULL_SESSION property is also only available since KDE 3.5.5. +# TDE_FULL_SESSION property is also only available since KDE 3.5.5. # The matching tests are: -# For $KDE_FULL_SESSION: -# if test -n "$KDE_FULL_SESSION"; then ... whatever -# For KDE_FULL_SESSION property: -# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null +# For $TDE_FULL_SESSION: +# if test -n "$TDE_FULL_SESSION"; then ... whatever +# For TDE_FULL_SESSION property: +# xprop -root | grep "^TDE_FULL_SESSION" >/dev/null 2>/dev/null # if test $? -eq 0; then ... whatever # # Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid # of the user running the KDE session. It should be rarely needed (e.g. # after sudo to prevent desktop-wide functionality in the new user's kded). # -KDE_FULL_SESSION=true -export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -echo "[startkde] KDE_FULL_SESSION: $KDE_FULL_SESSION" 1>&2 +TDE_FULL_SESSION=true +export TDE_FULL_SESSION +xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true +echo "[startkde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2 KDE_SESSION_UID=$UID export KDE_SESSION_UID echo "[startkde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2 @@ -611,8 +611,8 @@ for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do done done -unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +unset TDE_FULL_SESSION +xprop -root -remove TDE_FULL_SESSION unset KDE_SESSION_UID # Initialize_Status_Header |