* dbus/dbus-sysdeps-win.c (_dbus_win_set_error_from_win_error): use dbus friendly...

((fill_win_user_info_homedir): print user name in error case too.

diff --git a/ChangeLog b/ChangeLog
index 8da8662450824554dcb72d4c6ea98048d142c6f0..f5cf2042a96286de93f3664d7f0656fdea67d00b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * dbus/dbus-sysdeps-win.c (_dbus_win_set_error_from_win_error):
+       use dbus friendly error name.
+       (fill_win_user_info_homedir): print user name in error case too.
+
 2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
 
        * cmake/ConfigureChecks.cmake: fixed socketpair check

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 20c2400cd0cf96f8a28fe8e71402065a4db60197..8fc74ea09745800fffe671bc39589dd2b73ae041 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1304,7 +1304,7 @@ fill_win_user_info_homedir (wchar_t        *wname,
   else
     {
       char *dc_string = _dbus_win_utf16_to_utf8(dc,error);
-      _dbus_warn("NetUserGetInfo() failed with errorcode %d '%s', %s\n",ret,_dbus_lm_strerror(ret),dc_string);
+      _dbus_warn("NetUserGetInfo() for user '%s' failed with errorcode %d '%s', %s\n",_dbus_win_utf16_to_utf8(wname,error), ret,_dbus_lm_strerror(ret),dc_string);
       dbus_free(dc_string);
       /* Not set, so use something random. */
       info->homedir = _dbus_strdup ("\\");
@@ -2472,10 +2472,10 @@ _dbus_win_set_error_from_win_error (DBusError *error,
       strcpy (msg_copy, msg);
       LocalFree (msg);
 
-      dbus_set_error (error, "Win32 error", "%s", msg_copy);
+      dbus_set_error (error, "win32.error", "%s", msg_copy);
     }
   else
-    dbus_set_error_const (error, "Win32 error", "Unknown error code or FormatMessage failed");
+    dbus_set_error_const (error, "win32.error", "Unknown error code or FormatMessage failed");
 }
 
 void