aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config-druid.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-config-druid.c')
-rw-r--r--mail/mail-config-druid.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index dc8f0b5220..b1686c9908 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -130,14 +130,15 @@ identity_changed (GtkWidget *widget, gpointer data)
static void
identity_prepare (MailConfigWizard *mcw)
{
- const char *name;
-
mcw->page = MAIL_CONFIG_WIZARD_PAGE_IDENTITY;
- name = gtk_entry_get_text (mcw->gui->full_name);
- if (!name) {
- name = g_get_real_name ();
+ name =
+ if (!gtk_entry_get_text (mcw->gui->full_name)) {
+ char *uname;
+
+ uname = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);
gtk_entry_set_text (mcw->gui->full_name, name ? name : "");
+ g_free (uname);
}
identity_changed (NULL, mcw);
}
@@ -465,7 +466,7 @@ static MailConfigWizard *
config_wizard_new (void)
{
MailConfigWizard *mcw;
- const char *name, *user;
+ const char *user;
EAccountService *xport;
struct utsname uts;
EAccount *account;
@@ -474,8 +475,7 @@ config_wizard_new (void)
account = e_account_new ();
account->enabled = TRUE;
- name = g_get_real_name ();
- account->id->name = g_strdup (name);
+ account->id->name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);
user = g_get_user_name ();
if (user && !uname (&uts) && strchr (uts.nodename, '.'))
account->id->address = g_strdup_printf ("%s@%s", user, uts.nodename);