summaryrefslogtreecommitdiff
path: root/bus/dispatch.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-06-05 19:58:22 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-08-23 11:40:50 +0100
commit412538b3b9fb424c3af313815c3928a9ec221ad7 (patch)
treee459e1ced2ed8444a2a15f160e5ce239e20718bf /bus/dispatch.c
parent30fa2e1ace062314e9624b29239c2c7e9519e6c2 (diff)
downloaddbus-412538b3b9fb424c3af313815c3928a9ec221ad7.tar.gz
Export dbus_setenv() as a utility function
It's sufficiently portable that GLib has an equivalent, and I really don't want to have to either open-code it in dbus-run-session or link dbus-run-session statically. We have enough statically-linked rubbish already. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39196 Reviewed-by: Colin Walters <walters@verbum.org>
Diffstat (limited to 'bus/dispatch.c')
-rw-r--r--bus/dispatch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c
index 72d228ae..35a4b72b 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -34,6 +34,7 @@
#include "signals.h"
#include "test.h"
#include <dbus/dbus-internals.h>
+#include <dbus/dbus-misc.h>
#include <string.h>
#ifdef HAVE_UNIX_FD_PASSING
@@ -4466,7 +4467,7 @@ setenv_TEST_LAUNCH_HELPER_CONFIG(const DBusString *test_data_dir,
_dbus_verbose ("Setting TEST_LAUNCH_HELPER_CONFIG to '%s'\n",
_dbus_string_get_const_data (&full));
- _dbus_setenv ("TEST_LAUNCH_HELPER_CONFIG", _dbus_string_get_const_data (&full));
+ dbus_setenv ("TEST_LAUNCH_HELPER_CONFIG", _dbus_string_get_const_data (&full));
_dbus_string_free (&full);