diff options
| author | Tor Lillqvist <tml@iki.fi> | 2009-10-22 03:51:18 +0300 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2009-12-01 09:25:59 +0100 |
| commit | 475dc2fc735e4e27d7227ad7a0427da168975205 (patch) | |
| tree | 17ceb75bcf3caf6a06a37f5ac38a3b167aa105fd | |
| parent | 4c92983dce5384839ae187ab842d2ce8c7242808 (diff) | |
Use nonce-tcp default session bus on Windows
| -rw-r--r-- | bus/session.conf.in | 2 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bus/session.conf.in b/bus/session.conf.in index 85395c52..e121ff93 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -12,7 +12,7 @@ the behavior of child processes. --> <keep_umask/> - <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen> + <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen> <standard_session_servicedirs /> diff --git a/configure.in b/configure.in index 974e9cee..7ef6632e 100644 --- a/configure.in +++ b/configure.in @@ -1457,6 +1457,13 @@ fi AC_DEFINE_UNQUOTED(DBUS_SESSION_SOCKET_DIR, "$DBUS_SESSION_SOCKET_DIR", [Where per-session bus puts its sockets]) AC_SUBST(DBUS_SESSION_SOCKET_DIR) +if test x$dbus_win = xyes; then + DBUS_SESSION_BUS_DEFAULT_ADDRESS="nonce-tcp:" +else + DBUS_SESSION_BUS_DEFAULT_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR" +fi +AC_SUBST(DBUS_SESSION_BUS_DEFAULT_ADDRESS) + # darwin needs this to initialize the environment AC_CHECK_HEADERS(crt_externs.h) AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) @@ -1550,7 +1557,7 @@ echo " System bus socket: ${DBUS_SYSTEM_SOCKET} System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} System bus PID file: ${DBUS_SYSTEM_PID_FILE} - Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR} + Session bus address: ${DBUS_SESSION_BUS_DEFAULT_ADDRESS} Console auth dir: ${DBUS_CONSOLE_AUTH_DIR} Console owner file: ${have_console_owner_file} Console owner file path: ${DBUS_CONSOLE_OWNER_FILE} |