summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-03-29 12:15:15 -0700
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2016-06-30 13:51:20 +0100
commitd64d5f996b6146905b665cac9aa02da003ca1346 (patch)
treee8acf0c2db47475917169842cc4258c5e9fdf7e3
parentb6bc658103ef54e2bdc64a853b838def5ba4b96a (diff)
Quote the DBUS_SESSION_BUS_ADDRESS variable in the shell file
Some D-Bus daemon versions set multiple addresses separated by semi-colon, which breaks sourcing of the file. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=94746 Signed-off-by: Thiago Macieira <thiago@kde.org> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--tools/dbus-launch-x11.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c
index c7e33309..a09444be 100644
--- a/tools/dbus-launch-x11.c
+++ b/tools/dbus-launch-x11.c
@@ -414,7 +414,7 @@ set_address_in_file (char *address, pid_t pid, Window wid)
"# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will\n"
"# be used rather than this file.\n"
"# See \"man dbus-launch\" for more details.\n"
- "DBUS_SESSION_BUS_ADDRESS=%s\n"
+ "DBUS_SESSION_BUS_ADDRESS='%s'\n"
"DBUS_SESSION_BUS_PID=%ld\n"
"DBUS_SESSION_BUS_WINDOWID=%ld\n",
get_machine_uuid (),