From 81f994a359a8f70efa3ffcca2004233387815b06 Mon Sep 17 00:00:00 2001 From: Lauris Kaplinski Date: Fri, 25 Aug 2000 04:31:13 +0000 Subject: More UTF-8 handling svn path=/trunk/; revision=5032 --- mail/folder-browser.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mail/folder-browser.c') diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 9932498c0b..8279624e4c 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -12,6 +12,7 @@ #include #include "e-util/e-util.h" #include "e-util/e-sexp.h" +#include "e-util/e-unicode.h" #include "folder-browser.h" #include "mail.h" #include "mail-tools.h" @@ -154,9 +155,10 @@ search_set(FolderBrowser *fb) int index; char *text; - text = gtk_entry_get_text((GtkEntry *)fb->search_entry); + text = e_utf8_gtk_entry_get_text((GtkEntry *)fb->search_entry); if (text == NULL || text[0] == 0) { + if (text) g_free (text); mail_do_regenerate_messagelist (fb->message_list, NULL); return; } @@ -179,6 +181,8 @@ search_set(FolderBrowser *fb) } mail_do_regenerate_messagelist (fb->message_list, out->str); g_string_free(out, TRUE); + + g_free (text); } static void @@ -199,7 +203,7 @@ create_option_menu (char **menu_list, int item, void *data) while (*menu_list){ GtkWidget *entry; - entry = gtk_menu_item_new_with_label (*menu_list); + entry = e_utf8_gtk_menu_item_new_with_label (*menu_list); gtk_widget_show (entry); gtk_object_set_data((GtkObject *)entry, "search_option", (void *)i); gtk_menu_append (GTK_MENU (menu), entry); @@ -233,9 +237,10 @@ search_save(GtkWidget *w, FolderBrowser *fb) VfolderRule *rule; FilterPart *part; - text = gtk_entry_get_text((GtkEntry *)fb->search_entry); + text = e_utf8_gtk_entry_get_text((GtkEntry *)fb->search_entry); if (text == NULL || text[0] == 0) { + if (text) g_free (text); return; } @@ -285,6 +290,8 @@ search_save(GtkWidget *w, FolderBrowser *fb) } vfolder_gui_add_rule(rule); + + g_free (text); } void -- cgit