diff options
Diffstat (limited to 'tdeinit')
| -rw-r--r-- | tdeinit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeinit/tdeinit.cpp | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt index 346bfa20e..f6347899b 100644 --- a/tdeinit/CMakeLists.txt +++ b/tdeinit/CMakeLists.txt @@ -40,7 +40,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK ltdlc-static tdeparts-shared ${XFT_LIBRARIES} + LINK kICE-static ltdlc-static tdeparts-shared ${XFT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp index 566a8bda0..78ed1e7c4 100644 --- a/tdeinit/tdeinit.cpp +++ b/tdeinit/tdeinit.cpp @@ -59,6 +59,7 @@ #include <klibloader.h> #include <tdeapplication.h> #include <tdelocale.h> +#include <dcopglobal.h> #ifdef HAVE_SYS_PRCTL_H #include <sys/prctl.h> @@ -852,12 +853,7 @@ static void init_tdeinit_socket() exit(255); } } - path = getenv("ICEAUTHORITY"); - if (path.isEmpty()) - { - path = home_dir; - path += "/.ICEauthority"; - } + path = IceAuthFileName(); if (access(path.data(), R_OK|W_OK) && (errno != ENOENT)) { fprintf(stderr, "[tdeinit] Aborting. No write access to '%s'.\n", path.data()); |