aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-accounts.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 524557c4e0..286e3aa1e9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-accounts.c (load_accounts): Convert the UTF-8 account name
+ string into a gtk-string before using it in the GtkCList.
+
2001-08-14 Peter Williams <peterw@ximian.com>
* mail-callbacks.c (previous_unread_msg): Make previous unread
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index f7b371a498..7a5eec6e19 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -32,6 +32,8 @@
#include <camel/camel-url.h>
#include <camel/camel-pgp-context.h>
+#include <gal/widgets/e-unicode.h>
+
#include "widgets/misc/e-charset-picker.h"
#include "mail.h"
@@ -129,16 +131,16 @@ load_accounts (MailAccountsDialog *dialog)
while (node) {
CamelURL *url;
gchar *text[3];
-
+
account = node->data;
if (account->source && account->source->url)
url = camel_url_new (account->source->url, NULL);
else
url = NULL;
-
+
text[0] = "";
- text[1] = account->name;
+ text[1] = e_utf8_to_gtk_string (GTK_WIDGET (dialog->mail_accounts), account->name);
text[2] = g_strdup_printf ("%s%s", url && url->protocol ? url->protocol : _("None"),
(i == default_account) ? _(" (default)") : "");
@@ -146,6 +148,7 @@ load_accounts (MailAccountsDialog *dialog)
camel_url_free (url);
gtk_clist_append (dialog->mail_accounts, text);
+ g_free (text[1]);
g_free (text[2]);
if (account->source->enabled)