From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 28 Sep 2010 06:17:38 +0000 (+0200)
Subject: When launching dbus-daemon be more verbose in error case.
X-Git-Tag: dbus-1.4.1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4510983f13c8a403a0e4a916119667f24920bdd5;p=thirdparty%2Fdbus.git

When launching dbus-daemon be more verbose in error case.
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 821bc7bef..3c8da94a4 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2846,10 +2846,14 @@ _dbus_get_autolaunch_address (const char *scope, DBusString *address,
       CloseHandle (pi.hThread);
       CloseHandle (pi.hProcess);
       retval = _dbus_get_autolaunch_shm( address, &shm_address );
+      if (retval == FALSE)
+        dbus_set_error_const (error, DBUS_ERROR_FAILED, "Failed to get autolaunch address from launched dbus-daemon");
+    }
+  else
+    {
+      dbus_set_error_const (error, DBUS_ERROR_FAILED, "Failed to launch dbus-daemon");
+      retval == FALSE;
     }
-  
-  if (retval == FALSE)
-    dbus_set_error_const (error, DBUS_ERROR_FAILED, "Failed to launch dbus-daemon");
 
 out:
   if (retval)