casa-mp-base
Public
Commits
Bradley Giesbrecht authored 995f73153e5
| 1 - | From e0809d6c48641ab11e0dc1b3f537e56692208912 Mon Sep 17 00:00:00 2001 |
| 2 - | From: Benjamin Reed <rangerrick@befunk.com> |
| 3 - | Date: Sun, 19 Jul 2009 11:30:39 -0400 |
| 4 - | Subject: [PATCH 1/7] make session bus <listen> tag configurable |
| 5 - | |
| 6 - | --- |
| 7 - | bus/session.conf.in | 2 +- |
| 8 - | configure.in | 4 ++++ |
| 9 - | 2 files changed, 5 insertions(+), 1 deletions(-) |
| 10 - | |
| 11 - | diff --git a/bus/session.conf.in b/bus/session.conf.in |
| 12 - | index 85395c5..e121ff9 100644 |
| 13 - | --- a/bus/session.conf.in |
| 14 - | +++ b/bus/session.conf.in |
| 15 - | |
| 16 - | the behavior of child processes. --> |
| 17 - | <keep_umask/> |
| 18 - | |
| 19 - | - <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen> |
| 20 - | + <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen> |
| 21 - | |
| 22 - | <standard_session_servicedirs /> |
| 23 - | |
| 24 - | diff --git a/configure.in b/configure.in |
| 25 - | index d79d655..5b88385 100644 |
| 26 - | --- a/configure.in |
| 27 - | +++ b/configure.in |
| 28 - | |
| 29 - | AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS) |
| 30 - | AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_ADDRESS",[The default D-Bus address of the system bus]) |
| 31 - | |
| 32 - | +# set up the session bus address |
| 33 - | +DBUS_SESSION_BUS_DEFAULT_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR" |
| 34 - | +AC_SUBST(DBUS_SESSION_BUS_DEFAULT_ADDRESS) |
| 35 - | + |
| 36 - | #### Set up the pid file |
| 37 - | if ! test -z "$with_system_pid_file"; then |
| 38 - | DBUS_SYSTEM_PID_FILE=$with_system_pid_file |
| 39 - | -- |
| 40 - | 1.6.3.2 |
| 41 - | |