summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-03-07 17:33:18 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2012-03-07 17:33:18 -0600
commit691a81483430c4b7b4433d45381e8d32b6d56909 (patch)
tree7a5fffa1e5567e01064da713ed5d6ec5ff228a9d /kinit
parent116a6f5778c33b337c2f4cd04d9216c41d4ef8d5 (diff)
downloadtdelibs-691a81483430c4b7b4433d45381e8d32b6d56909.tar.gz
tdelibs-691a81483430c4b7b4433d45381e8d32b6d56909.zip
Rename straggling environment variables KDE->TDE.
Diffstat (limited to 'kinit')
-rw-r--r--kinit/kinit.cpp10
-rw-r--r--kinit/klauncher.cpp6
2 files changed, 8 insertions, 8 deletions
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 3c03f78e8..9962c9867 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -590,7 +590,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
exitWithErrorMsg(errorMsg);
}
- if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
+ if ( getenv("TDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
libpath.truncate(0);
if ( !libpath.isEmpty() )
@@ -838,7 +838,7 @@ static void init_tdeinit_socket()
{
TQCString path = home_dir;
- TQCString readOnly = getenv("KDE_HOME_READONLY");
+ TQCString readOnly = getenv("TDE_HOME_READONLY");
if (access(path.data(), R_OK|W_OK))
{
if (errno == ENOENT)
@@ -1227,7 +1227,7 @@ static void handle_launcher_request(int sock = -1)
// support for the old a bit broken way of setting DISPLAY for multihead
TQCString olddisplay = getenv(DISPLAY);
- TQCString kdedisplay = getenv("KDE_DISPLAY");
+ TQCString kdedisplay = getenv("TDE_DISPLAY");
bool reset_display = (! olddisplay.isEmpty() &&
! kdedisplay.isEmpty() &&
olddisplay != kdedisplay);
@@ -1240,7 +1240,7 @@ static void handle_launcher_request(int sock = -1)
tty, avoid_loops, startup_id_str );
if (reset_display) {
- unsetenv("KDE_DISPLAY");
+ unsetenv("TDE_DISPLAY");
setenv(DISPLAY, olddisplay, true);
}
@@ -1804,7 +1804,7 @@ int main(int argc, char **argv, char **envp)
}
}
#ifndef __CYGWIN__
- if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
+ if (!d.suicide && !getenv("TDE_IS_PRELINKED"))
{
TQString konq = locate("lib", "libkonq.la", s_instance);
if (!konq.isEmpty())
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index ab9bd063f..2d706e36b 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -207,15 +207,15 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
lastRequest = 0;
bProcessingQueue = false;
- mSlaveDebug = getenv("KDE_SLAVE_DEBUG_WAIT");
+ mSlaveDebug = getenv("TDE_SLAVE_DEBUG_WAIT");
if (!mSlaveDebug.isEmpty())
{
tqWarning("Klauncher running in slave-debug mode for slaves of protocol '%s'", mSlaveDebug.data());
}
- mSlaveValgrind = getenv("KDE_SLAVE_VALGRIND");
+ mSlaveValgrind = getenv("TDE_SLAVE_VALGRIND");
if (!mSlaveValgrind.isEmpty())
{
- mSlaveValgrindSkin = getenv("KDE_SLAVE_VALGRIND_SKIN");
+ mSlaveValgrindSkin = getenv("TDE_SLAVE_VALGRIND_SKIN");
tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data());
}
klauncher_header request_header;