dbus/dbus dbus-sysdeps-win.c,1.1,1.2

[Ralf Habacker]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv5681/dbus

Modified Files:
	dbus-sysdeps-win.c 
Log Message:
* 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.

Index: dbus-sysdeps-win.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-win.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus-sysdeps-win.c	3 Mar 2007 17:25:53 -0000	1.1
+++ dbus-sysdeps-win.c	8 Mar 2007 13:04:18 -0000	1.2
@@ -1304,7 +1304,7 @@
   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 @@
       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