3 files changed, 12 insertions, 8 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 9c0213edd8..12f9dbf9e0 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -19,6 +19,7 @@
 #include <ebook/e-book.h>
 #include <e-util/e-util.h>
 #include <e-util/e-popup-menu.h>
+#include <e-util/e-unicode.h>
 #include "e-minicard-view-widget.h"
 #include "addressbook/gui/search/e-addressbook-search-dialog.h"
 
@@ -298,7 +299,7 @@ find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
 					   GNOME_STOCK_BUTTON_CANCEL, NULL);
 
 	search_text = get_query (view);
-	gtk_entry_set_text(GTK_ENTRY(search_entry), search_text);
+	e_utf8_gtk_entry_set_text(GTK_ENTRY(search_entry), search_text);
 	g_free (search_text);
 
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
@@ -311,8 +312,9 @@ find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
 
 	/* If the user clicks "okay"...*/
 	if (result == 0) {
-		search_text = gtk_entry_get_text(GTK_ENTRY(search_entry));
+		search_text = e_utf8_gtk_entry_get_text(GTK_ENTRY(search_entry));
 		set_query (view, search_text);
+		g_free (search_text);
 	}
 	
 }
@@ -450,7 +452,7 @@ static GnomeUIInfo gnome_toolbar [] = {
 static void
 search_entry_activated (GtkWidget* widget, gpointer user_data)
 {
-	char* search_word = gtk_entry_get_text(GTK_ENTRY(widget));
+	char* search_word = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
 	char* search_query;
 	AddressbookView *view = (AddressbookView *) user_data;
 
@@ -465,6 +467,7 @@ search_entry_activated (GtkWidget* widget, gpointer user_data)
 	set_query(view, search_query);
 
 	g_free (search_query);
+	g_free (search_word);
 }
 
 static GtkWidget*
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 <config.h>
 #include <gnome.h>
+#include <e-util/e-unicode.h>
 #include <e-contact-editor-fullname.h>
 
 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;