summaryrefslogtreecommitdiff
path: root/bus/activation-helper.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/activation-helper.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/activation-helper.c')
-rw-r--r--bus/activation-helper.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index 8d7ae36f..e3b3323c 100644
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -40,6 +40,7 @@
#include <pwd.h>
#include <grp.h>
+#include <dbus/dbus-misc.h>
#include <dbus/dbus-shell.h>
#include <dbus/dbus-marshal-validate.h>
@@ -156,8 +157,8 @@ clear_environment (DBusError *error)
}
/* Ensure the bus is set to system */
- _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
- _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
+ dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
+ dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
#endif
return TRUE;