diff options
Diffstat (limited to 'kinit')
| -rw-r--r-- | kinit/Makefile.am | 2 | ||||
| -rw-r--r-- | kinit/autostart.cpp | 8 | ||||
| -rw-r--r-- | kinit/kinit.cpp | 10 | ||||
| -rw-r--r-- | kinit/kstartupconfig.cpp | 2 | ||||
| -rw-r--r-- | kinit/lnusertemp.c | 5 | ||||
| -rw-r--r-- | kinit/wrapper.c | 2 |
6 files changed, 20 insertions, 9 deletions
diff --git a/kinit/Makefile.am b/kinit/Makefile.am index 1bbb44991..4328af871 100644 --- a/kinit/Makefile.am +++ b/kinit/Makefile.am @@ -56,7 +56,7 @@ kwrapper_SOURCES = kwrapper.c kwrapper_LDADD = $(LIBSOCKET) klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version -klauncher_la_LIBADD = $(LIB_KIO) +klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp kstartupconfig_SOURCES = kstartupconfig.cpp diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index 0b39a3275..7780f793c 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -48,6 +48,14 @@ AutoStart::AutoStart( bool new_startup ) m_startList = new AutoStartList; m_startList->setAutoDelete(true); KGlobal::dirs()->addResourceType("autostart", "share/autostart"); + QString xdgdirs = getenv("XDG_CONFIG_DIRS"); + if (xdgdirs.isEmpty()) + xdgdirs = "/etc/xdg"; + + QStringList xdgdirslist = QStringList::split( ':', xdgdirs ); + for ( QStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) { + KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); + } } AutoStart::~AutoStart() diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 8b654b038..77608b94b 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -60,7 +60,7 @@ #include <kapplication.h> #include <klocale.h> -#ifdef Q_OS_LINUX +#ifdef HAVE_SYS_PRCTL_H #include <sys/prctl.h> #ifndef PR_SET_NAME #define PR_SET_NAME 15 @@ -256,18 +256,18 @@ static void setup_tty( const char* tty ) int fd = open( tty, O_WRONLY ); if( fd < 0 ) { - perror( "kdeinit: couldn't open() tty" ); + fprintf(stderr, "kdeinit: couldn't open() %s: %s\n", tty, strerror (errno) ); return; } if( dup2( fd, STDOUT_FILENO ) < 0 ) { - perror( "kdeinit: couldn't dup2() tty" ); + fprintf(stderr, "kdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) ); close( fd ); return; } if( dup2( fd, STDERR_FILENO ) < 0 ) { - perror( "kdeinit: couldn't dup2() tty" ); + fprintf(stderr, "kdeinit: couldn't dup2() %s: %s\n", tty, strerror (errno) ); close( fd ); return; } @@ -571,7 +571,7 @@ static pid_t launch(int argc, const char *_name, const char *args, d.argv[argc] = 0; /** Give the process a new name **/ -#ifdef Q_OS_LINUX +#ifdef HAVE_SYS_PRCTL_H /* set the process name, so that killall works like intended */ r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0); if ( r == 0 ) diff --git a/kinit/kstartupconfig.cpp b/kinit/kstartupconfig.cpp index 8bb60c127..0700f22fc 100644 --- a/kinit/kstartupconfig.cpp +++ b/kinit/kstartupconfig.cpp @@ -81,7 +81,7 @@ int main() else if( getenv( "HOME" )) { strlcpy( kdehome, getenv( "HOME" ), 1024 ); - strlcat( kdehome, "/.kde", 1024 ); + strlcat( kdehome, "/.kde3", 1024 ); } else return 1; diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c index 70457f74f..867f1fb95 100644 --- a/kinit/lnusertemp.c +++ b/kinit/lnusertemp.c @@ -89,6 +89,9 @@ int create_link(const char *file, const char *tmp_dir) } +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif int build_link(const char *tmp_prefix, const char *kde_prefix) { struct passwd *pw_ent; @@ -116,7 +119,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix) if (!kde_home || !kde_home[0]) { - kde_home = "~/.kde/"; + kde_home = "~/.kde3/"; } if (kde_home[0] == '~') diff --git a/kinit/wrapper.c b/kinit/wrapper.c index 0248e4789..d1d754b7b 100644 --- a/kinit/wrapper.c +++ b/kinit/wrapper.c @@ -139,7 +139,7 @@ static int openSocket() if (!kde_home || !kde_home[0]) { - kde_home = "~/.kde/"; + kde_home = "~/.kde3/"; } if (kde_home[0] == '~') |