From e8ae4bc97abed6ad8571908f5fc4ac6fd5565fde Mon Sep 17 00:00:00 2001 From: Lauris Kaplinski Date: Sat, 2 Sep 2000 02:51:32 +0000 Subject: A bit more e_utf8 wrappers here and there svn path=/trunk/; revision=5180 --- mail/ChangeLog | 7 +++++++ mail/mail-config-gui.c | 24 ++++++++++++------------ mail/main.c | 3 +++ 3 files changed, 22 insertions(+), 12 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index f1d01d5b58..f3cd8e7fa7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2000-09-02 Lauris Kaplinski + + * mail-config-gui.c: Use e_utf8 wrappers + + * main.c (main): Do e_unicode_init, so we are not confusing + libunicode + 2000-09-01 Christopher James Lahey * folder-browser.c: Removed a warning. diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c index 8a007dc1c1..90437f6267 100644 --- a/mail/mail-config-gui.c +++ b/mail/mail-config-gui.c @@ -1727,7 +1727,7 @@ identities_add_clicked (GtkWidget *widget, MailDialog *dialog) text[2] = id->org; text[3] = id->sig; - row = gtk_clist_append (GTK_CLIST (clist), text); + row = e_utf8_gtk_clist_append (GTK_CLIST (clist), text); gtk_clist_set_row_data (GTK_CLIST (clist), row, id); gtk_clist_select_row (GTK_CLIST (clist), row, 0); dialog->maxidrow++; @@ -1751,10 +1751,10 @@ identities_edit_clicked (GtkWidget *widget, MailDialog *dialog) if (id2) { GtkCList *clist = GTK_CLIST (dialog->clistIdentities); - gtk_clist_set_text (clist, dialog->idrow, 0, id2->name); - gtk_clist_set_text (clist, dialog->idrow, 1, id2->address); - gtk_clist_set_text (clist, dialog->idrow, 2, id2->org); - gtk_clist_set_text (clist, dialog->idrow, 3, id2->sig); + e_utf8_gtk_clist_set_text (clist, dialog->idrow, 0, id2->name); + e_utf8_gtk_clist_set_text (clist, dialog->idrow, 1, id2->address); + e_utf8_gtk_clist_set_text (clist, dialog->idrow, 2, id2->org); + e_utf8_gtk_clist_set_text (clist, dialog->idrow, 3, id2->sig); gtk_clist_set_row_data (clist, dialog->idrow, id2); identity_destroy (id); @@ -1804,7 +1804,7 @@ sources_add_clicked (GtkWidget *widget, MailDialog *dialog) text[0] = source->url; - row = gtk_clist_append (clist, text); + row = e_utf8_gtk_clist_append (clist, text); gtk_clist_set_row_data (clist, row, source); gtk_clist_select_row (clist, row, 0); dialog->maxsrow++; @@ -1828,7 +1828,7 @@ sources_edit_clicked (GtkWidget *widget, MailDialog *dialog) if (source2) { GtkCList *clist = GTK_CLIST (dialog->clistSources); - gtk_clist_set_text (clist, dialog->srow, 0, source2->url); + e_utf8_gtk_clist_set_text (clist, dialog->srow, 0, source2->url); gtk_clist_set_row_data (clist, dialog->srow, source2); service_destroy (source); @@ -1877,7 +1877,7 @@ news_add_clicked (GtkWidget *widget, MailDialog *dialog) text[0] = news->url; - row = gtk_clist_append (clist, text); + row = e_utf8_gtk_clist_append (clist, text); gtk_clist_set_row_data (clist, row, news); gtk_clist_select_row (clist, row, 0); dialog->maxnrow++; @@ -1901,7 +1901,7 @@ news_edit_clicked (GtkWidget *widget, MailDialog *dialog) if (news2) { GtkCList *clist = GTK_CLIST (dialog->clistNews); - gtk_clist_set_text (clist, dialog->nrow, 0, news2->url); + e_utf8_gtk_clist_set_text (clist, dialog->nrow, 0, news2->url); gtk_clist_set_row_data (clist, dialog->nrow, news2); service_destroy (news); @@ -2074,7 +2074,7 @@ mail_config (Evolution_Shell shell) text[2] = id->org; text[3] = id->sig; - row = gtk_clist_append (clist, text); + row = e_utf8_gtk_clist_append (clist, text); gtk_clist_set_row_data (clist, row, id); } @@ -2114,7 +2114,7 @@ mail_config (Evolution_Shell shell) text[0] = source->url; - row = gtk_clist_append (clist, text); + row = e_utf8_gtk_clist_append (clist, text); gtk_clist_set_row_data (clist, row, source); } @@ -2154,7 +2154,7 @@ mail_config (Evolution_Shell shell) text[0] = news->url; - row = gtk_clist_append (clist, text); + row = e_utf8_gtk_clist_append (clist, text); gtk_clist_set_row_data (clist, row, news); } diff --git a/mail/main.c b/mail/main.c index be35d52fd4..0ab58f9a3d 100644 --- a/mail/main.c +++ b/mail/main.c @@ -23,6 +23,7 @@ #include "e-util/e-gui-utils.h" #include "e-util/e-cursors.h" +#include "e-util/e-unicode.h" #include "component-factory.h" #include "mail.h" @@ -57,6 +58,8 @@ main (int argc, char *argv []) glade_gnome_init (); + e_unicode_init (); + session_init (); e_cursors_init (); -- cgit v1.2.3