From 4510983f13c8a403a0e4a916119667f24920bdd5 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 28 Sep 2010 08:17:38 +0200
Subject: [PATCH] When launching dbus-daemon be more verbose in error case.

---
 dbus/dbus-sysdeps-win.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 821bc7be..3c8da94a 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)