From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 16 May 2016 10:57:04 +0000 (+0200)
Subject: Merge branch 'dbus-1.10'
X-Git-Tag: dbus-1.11.4~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c126716adacb8fb404283d9ca3d81568a038e54b;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.10'
---

c126716adacb8fb404283d9ca3d81568a038e54b
diff --cc dbus/dbus-spawn-win.c
index 3ae5749c6,f741f923a..119bfd1e3
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@@ -603,8 -605,15 +603,9 @@@ babysitter (void *parameter
  {
    int ret = 0;
    DBusBabysitter *sitter = (DBusBabysitter *) parameter;
+   HANDLE handle;
  
    PING();
 -  if (sitter->child_setup)
 -    {
 -      PING();
 -      (*sitter->child_setup) (sitter->user_data);
 -    }
 -
    _dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
  
    PING();