summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
Diffstat (limited to 'kinit')
-rw-r--r--kinit/autostart.cpp2
-rw-r--r--kinit/kstartupconfig.cpp14
-rw-r--r--kinit/lnusertemp.c2
3 files changed, 9 insertions, 9 deletions
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 334bfa543..4824f2b23 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -143,7 +143,7 @@ AutoStart::loadAutoStartList()
localit != files.end();
++localit)
{
- if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localkdedir()) == true)) {
+ if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) {
// Same local file name?
TQString localOuter;
TQString localInner;
diff --git a/kinit/kstartupconfig.cpp b/kinit/kstartupconfig.cpp
index 3e4d68156..3204d6f7d 100644
--- a/kinit/kstartupconfig.cpp
+++ b/kinit/kstartupconfig.cpp
@@ -75,25 +75,25 @@ Otherwise kdostartupconfig is launched to create or update all the necessary fil
int main()
{
- char kdehome[ 1024 ];
+ char tdehome[ 1024 ];
if( getenv( "TDEHOME" ))
- strlcpy( kdehome, getenv( "TDEHOME" ), 1024 );
+ strlcpy( tdehome, getenv( "TDEHOME" ), 1024 );
else if( getenv( "HOME" ))
{
- strlcpy( kdehome, getenv( "HOME" ), 1024 );
- strlcat( kdehome, "/.trinity", 1024 );
+ strlcpy( tdehome, getenv( "HOME" ), 1024 );
+ strlcat( tdehome, "/.trinity", 1024 );
}
else
return 1;
char filename[ 1024 ];
- strlcpy( filename, kdehome, 1024 );
+ strlcpy( filename, tdehome, 1024 );
strlcat( filename, "/share/config/startupconfig", 1024 );
if( access( filename, R_OK ) != 0 )
{
int ret = system( "kdostartupconfig" );
return WEXITSTATUS( ret );
}
- strlcpy( filename, kdehome, 1024 );
+ strlcpy( filename, tdehome, 1024 );
strlcat( filename, "/share/config/startupconfigfiles", 1024 );
struct stat st;
if( stat( filename, &st ) != 0 )
@@ -108,7 +108,7 @@ int main()
int ret = system( "kdostartupconfig" );
return WEXITSTATUS( ret );
}
- strlcpy( filename, kdehome, 1024 );
+ strlcpy( filename, tdehome, 1024 );
strlcat( filename, "/share/config/startupconfigkeys", 1024 );
FILE* keys = fopen( filename, "r" );
if( keys == NULL )
diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c
index 1b613a760..d0a424d10 100644
--- a/kinit/lnusertemp.c
+++ b/kinit/lnusertemp.c
@@ -100,7 +100,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
char tmp_buf[PATH_MAX+1];
int uid = getuid();
const char *home_dir = getenv("HOME");
- const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
+ const char *kde_home = uid ? getenv("TDEHOME") : getenv("TDEROOTHOME");
int result;
struct stat stat_buf;