* bus/activation.c: (bus_activation_activate_service):

fixed call to _dbus_spawn_async_with_babysitter().

diff --git a/ChangeLog b/ChangeLog
index aa0b92056419fa5b8df70d98490e55240d6dd57e..58a63650abb34dc232d09ce90b2c7a145f4a5960 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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):

diff --git a/bus/activation.c b/bus/activation.c
index 19b4d66abff88255651312c4cad128fa9d5f6e91..b729eb18adb280f66294be21f122db4036d29e9b 100644 (file)
--- 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))
     {