From e4bfed33234c7381120094e241a98eb54f60c723 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 19 Feb 2013 15:06:23 +0000 Subject: [PATCH 8/8] On Unix, try xdg-runtime: before autolaunch: by default This means that if DBUS_SESSION_BUS_ADDRESS is not set, but XDG_RUNTIME_DIR is, and $XDG_RUNTIME_DIR/dbus_user_bus_socket exists and can be connected to, we will use it instead of X11 autolaunch. Signed-off-by: Simon McVittie --- configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 15e0727..4af4893 100644 --- a/configure.ac +++ b/configure.ac @@ -1767,15 +1767,14 @@ if test "x$with_dbus_session_bus_connect_address" != "x"; then # the user specified something, trust them DBUS_SESSION_BUS_CONNECT_ADDRESS="$with_dbus_session_bus_connect_address" elif test x$dbus_win = xyes; then - # Windows autolaunching is a bit different; leaving it in its own - # branch of the conditional because the default might conceivably - # change (see #38201) + # Windows autolaunching is a bit different DBUS_SESSION_BUS_CONNECT_ADDRESS="autolaunch:" else # The default on all other Unix platforms (notably Linux) - # is to use auto-launching - this works a bit differently on Mac OS X + # is to try the $XDG_RUNTIME_DIR/dbus_user_bus_socket, or failing that, + # X11 auto-launching - this works a bit differently on Mac OS X # but comes out basically the same in the end - DBUS_SESSION_BUS_CONNECT_ADDRESS="autolaunch:" + DBUS_SESSION_BUS_CONNECT_ADDRESS="xdg-runtime:;autolaunch:" fi AC_SUBST([DBUS_SESSION_BUS_CONNECT_ADDRESS]) AC_DEFINE_UNQUOTED([DBUS_SESSION_BUS_CONNECT_ADDRESS], -- 1.7.10.4