summaryrefslogtreecommitdiffstats
path: root/tdm
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-04 02:46:39 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-04 02:46:39 +0100
commit1f3832a1368de214e95a38dd391367f8ae2456cb (patch)
treeac2c0e68c7a1393b124528054bd11df69e32381b /tdm
parent6275375b6aa17c6da78ab6486a8c930e9fd595f5 (diff)
downloadtdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.tar.gz
tdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.zip
Removed unnecessary dependency on dbus-tqt and dbus-1-tqt
Diffstat (limited to 'tdm')
-rw-r--r--tdm/backend/CMakeLists.txt6
-rw-r--r--tdm/backend/client.c9
2 files changed, 3 insertions, 12 deletions
diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt
index 625c8e85..9f9d0430 100644
--- a/tdm/backend/CMakeLists.txt
+++ b/tdm/backend/CMakeLists.txt
@@ -14,11 +14,11 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${DBUS_TQT_INCLUDE_DIRS}
+ ${DBUS_INCLUDE_DIRS}
)
link_directories(
- ${DBUS_TQT_LIBRARY_DIRS}
+ ${DBUS_LIBRARY_DIRS}
)
##### tdm (executable) ##########################
@@ -43,6 +43,6 @@ tde_add_executable( tdm
process.c protodpy.c reset.c resource.c rpcauth.c
server.c session.c sessreg.c socket.c streams.c
util.c xdmauth.c xdmcp.c
- LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
+ LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/tdm/backend/client.c b/tdm/backend/client.c
index d6ed5a1d..c9948ebf 100644
--- a/tdm/backend/client.c
+++ b/tdm/backend/client.c
@@ -95,10 +95,6 @@ extern int loginsuccess( const char *User, const char *Host, const char *Tty, ch
#define log_to_audit_system(l,h,d,s) do { ; } while (0)
#endif
-#ifdef WITH_CONSOLE_KIT
-#include "consolekit.h"
-#endif
-
/*
* Session data, mostly what struct verify_info was for
*/
@@ -1315,11 +1311,6 @@ StartClient()
env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
}
#endif
-#ifdef WITH_CONSOLE_KIT
- if (ck_session_cookie != NULL) {
- env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
- }
-#endif
userEnviron = inheritEnv( env, envvars );
env = systemEnv( p->pw_name );
systemEnviron = setEnv( env, "HOME", p->pw_dir );