]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
dbus-spawn-win: Do not attempt to call child_setup (again)
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 13 May 2016 13:54:33 +0000 (14:54 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 13 May 2016 14:03:57 +0000 (16:03 +0200)
This reinstates part of commit 420f3474, fixing a mis-merge in
commit 8c0d5980.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
dbus/dbus-spawn-win.c

index 9c72c955d0110dc1529a14604575b4cae65e5e34..3ae5749c673b9d6efddf666250859248113eeab6 100644 (file)
@@ -605,12 +605,6 @@ babysitter (void *parameter)
   DBusBabysitter *sitter = (DBusBabysitter *) parameter;
 
   PING();
-  if (sitter->child_setup)
-    {
-      PING();
-      (*sitter->child_setup) (sitter->user_data);
-    }
-
   _dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
 
   PING();