From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 13 May 2016 13:54:33 +0000 (+0100)
Subject: dbus-spawn-win: Do not attempt to call child_setup (again)
X-Git-Tag: dbus-1.11.4~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ef8b4dc59bbab50b9e898ec886b234147e4b23d;p=thirdparty%2Fdbus.git

dbus-spawn-win: Do not attempt to call child_setup (again)

This reinstates part of commit 420f3474, fixing a mis-merge in
commit 8c0d5980.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index 9c72c955d..3ae5749c6 100644
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -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();