From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sun, 4 Mar 2007 22:09:50 +0000 (+0000)
Subject: * bus/activation.c: (bus_activation_activate_service):
X-Git-Tag: dbus-1.1.0~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a780c4e834f497df237ec691468ea79c8bf71c2c;p=platform%2Fupstream%2Fdbus.git

* bus/activation.c: (bus_activation_activate_service):
fixed call to _dbus_spawn_async_with_babysitter().
---

diff --git a/ChangeLog b/ChangeLog
index aa0b920..58a6365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-04  Ralf Habacker  <ralf.habacker@freenet.de>
 
+	* bus/activation.c: (bus_activation_activate_service):
+	fixed call to _dbus_spawn_async_with_babysitter().
+
+2007-03-04  Ralf Habacker  <ralf.habacker@freenet.de>
+
 	* dbus/dbus-spawn.c,dbus/dbus-spawn.h (_dbus_spawn_async_with_babysitter):
 	added environment pointer as function parameter, used on win32.
 
diff --git a/bus/activation.c b/bus/activation.c
index 19b4d66..b729eb1 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1310,6 +1310,7 @@ bus_activation_activate_service (BusActivation  *activation,
   DBusMessage *message;
   DBusString service_str;
   char **argv;
+  char **envp = NULL;
   int argc;
   dbus_bool_t retval;
   DBusHashIter iter;
@@ -1541,6 +1542,7 @@ bus_activation_activate_service (BusActivation  *activation,
 
   _dbus_verbose ("Spawning %s ...\n", argv[0]);
   if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv,
+                                          envp,
                                           child_setup, activation, 
                                           error))
     {