aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-account-editor.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 10c589de2f..74b791ebdf 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-14 Tor Lillqvist <tml@novell.com>
+
+ * em-account-editor.c (emae_check_complete): g_get_real_name()
+ returns UTF-8 on Win32.
+
2006-06-13 Andre Klapper <a9016009@gmx.de>
* mail.error.xml: changing string "Ximian Evolution" to "Evolution".
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index ba51b4e741..1d2c07bd91 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2539,7 +2539,11 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
char *uname;
emae->priv->identity_set = 1;
+#ifndef G_OS_WIN32
uname = g_locale_to_utf8(g_get_real_name(), -1, NULL, NULL, NULL);
+#else
+ uname = g_strdup(g_get_real_name());
+#endif
if (uname) {
gtk_entry_set_text(emae->priv->identity_entries[1], uname);
g_free(uname);