From 412538b3b9fb424c3af313815c3928a9ec221ad7 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 5 Jun 2013 19:58:22 +0100
Subject: 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>
---
 bus/activation-helper.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bus/activation-helper.c')

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;
-- 
cgit v1.2.1