diff options
Diffstat (limited to 'kded')
| -rw-r--r-- | kded/kbuildsycoca.cpp | 2 | ||||
| -rw-r--r-- | kded/kded.cpp | 4 | ||||
| -rw-r--r-- | kded/khostname.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 27d336386..da5059a92 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -733,7 +733,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (bGlobalDatabase) { setenv("TDEHOME", "-", 1); - setenv("KDEROOTHOME", "-", 1); + setenv("TDEROOTHOME", "-", 1); } KApplication::disableAutoDcopRegistration(); diff --git a/kded/kded.cpp b/kded/kded.cpp index 05964b0df..9114c57a2 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -158,11 +158,11 @@ void Kded::initModules() KConfig *config = kapp->config(); 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()) + if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid()) kde_running = false; // Preload kded modules. KService::List kdedModules = KServiceType::offers("KDEDModule"); - TQString version = getenv( "KDE_SESSION_VERSION" ); + TQString version = getenv( "TDE_SESSION_VERSION" ); TQStringList blacklist; if ( version >= "4" ) { diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 168ad0f56..e7b1cf209 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -299,8 +299,8 @@ void KHostName::changeDcop() void KHostName::changeStdDirs(const TQCString &type) { // We make links to the old dirs cause we can't delete the old dirs. - TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(oldName.data())); - TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(newName.data())); + TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); + TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); KDE_struct_stat st_buf; |