From 8d63772a7dffe54c6320a70021110e33dfe7c1ba Mon Sep 17 00:00:00 2001 From: Lauris Kaplinski Date: Thu, 24 Aug 2000 03:25:53 +0000 Subject: Unicode in addressbook basically works, including simple searching svn path=/trunk/; revision=4997 --- addressbook/gui/contact-editor/e-contact-editor-fullname.c | 5 +++-- addressbook/gui/contact-editor/e-contact-editor.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'addressbook/gui/contact-editor') diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index b2e598fdde..d455640164 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -22,6 +22,7 @@ #include #include +#include #include static void e_contact_editor_fullname_init (EContactEditorFullname *card); @@ -171,7 +172,7 @@ fill_in_field(EContactEditorFullname *editor, char *field, char *string) GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field)); if (entry) { if (string) - gtk_entry_set_text(entry, string); + e_utf8_gtk_entry_set_text(entry, string); else gtk_entry_set_text(entry, ""); } @@ -195,7 +196,7 @@ extract_field(EContactEditorFullname *editor, char *field) { GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field)); if (entry) - return g_strdup(gtk_entry_get_text(entry)); + return e_utf8_gtk_entry_get_text(entry); else return NULL; } diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index ddd232b157..aa9b1ff9c9 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -359,8 +359,8 @@ file_as_set_style(EContactEditor *editor, int style) if (style == -1) { - string = e_utf8_gtk_entry_get_text(file_as); - strings = g_list_append(strings, string); + string = gtk_entry_get_text(file_as); + strings = g_list_append(strings, g_strdup(string)); } widget = glade_xml_get_widget(editor->gui, "combo-file-as"); @@ -479,7 +479,7 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor) GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name)); int result; gtk_widget_show(GTK_WIDGET(dialog)); - result = gnome_dialog_run_and_close (dialog); + result = gnome_dialog_run (dialog); if (result == 0) { ECardName *name; GtkWidget *fname_widget; -- cgit v1.2.3