diff options
author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-08 13:04:18 +0000 |
---|---|---|
committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-08 13:04:18 +0000 |
commit | 2eca6a2241f0f49009c85704170159bf46c5dbb8 (patch) | |
tree | 012c985849a02408c9ecd62ac3244a4db877a363 | |
parent | 5f5a1a3366e2b30a2e2183222e3e5d704b9d5e58 (diff) |
* 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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dbus/dbus-sysdeps-win.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,11 @@ 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 2007-03-08 Ralf Habacker <ralf.habacker@freenet.de> diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 20c2400c..8fc74ea0 100644 --- 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 |