summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2016-05-13 14:54:33 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2016-05-13 16:03:57 +0200
commit5ef8b4dc59bbab50b9e898ec886b234147e4b23d (patch)
tree6de5ba8ded6aa58e21a13cf1875fe6d0ca304c34
parent8c0d59802996446ff0accdacee8dfe3f4522eb71 (diff)
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>
-rw-r--r--dbus/dbus-spawn-win.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index 9c72c955..3ae5749c 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();