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 --- filter/ChangeLog | 8 ++++++++ filter/filter-folder.c | 8 +++++--- filter/filter-input.c | 8 +++++--- filter/filter-rule.c | 6 ++++-- 4 files changed, 22 insertions(+), 8 deletions(-) (limited to 'filter') diff --git a/filter/ChangeLog b/filter/ChangeLog index 31b39867cb..b1d0466194 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,11 @@ +2000-08-24 Lauris Kaplinski + + * filter-folder.c: Use e_utf8 wrappers + + * filter-input.c: Use e_utf8 wrappers + + * filter-rule.c: Use e_utf8 wrappers + 2000-08-23 Dan Winship * filter-datespec.c (cal_day_selected): Set seltime.tm_isdst to diff --git a/filter/filter-folder.c b/filter/filter-folder.c index 60212086ee..cb2d87c29f 100644 --- a/filter/filter-folder.c +++ b/filter/filter-folder.c @@ -23,6 +23,8 @@ #define SHELL +#include + #include "filter-folder.h" #ifdef SHELL #include "shell/evolution-shell-client.h" @@ -207,7 +209,7 @@ static void button_clicked(GtkButton *button, FilterFolder *ff) NULL); entry = (GtkEntry *)gtk_entry_new(); if (ff->uri) { - gtk_entry_set_text(entry, ff->uri); + e_utf8_gtk_entry_set_text(entry, ff->uri); } gtk_box_pack_start((GtkBox *)gd->vbox, (GtkWidget *)entry, TRUE, TRUE, 3); gtk_widget_show((GtkWidget *)entry); @@ -215,8 +217,8 @@ static void button_clicked(GtkButton *button, FilterFolder *ff) case 0: g_free(ff->uri); g_free(ff->name); - uri = gtk_entry_get_text(entry); - ff->uri = g_strdup(uri); + uri = e_utf8_gtk_entry_get_text(entry); + ff->uri = uri; str = strstr(uri, "//"); if (str) str = strchr(str+2, '/'); diff --git a/filter/filter-input.c b/filter/filter-input.c index f422a091b1..8811c1b6d7 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -21,6 +21,8 @@ #include #include +#include + #include "filter-input.h" #include "e-util/e-sexp.h" @@ -216,7 +218,7 @@ static void entry_changed(GtkEntry *entry, FilterElement *fe) FilterInput *fi = (FilterInput *)fe; GList *l; - new = gtk_entry_get_text(entry); + new = e_utf8_gtk_entry_get_text(entry); /* NOTE: entry only supports a single value ... */ l = fi->values; @@ -226,7 +228,7 @@ static void entry_changed(GtkEntry *entry, FilterElement *fe) } g_list_free(fi->values); - fi->values = g_list_append(NULL, g_strdup(new)); + fi->values = g_list_append(NULL, new); } static GtkWidget *get_widget(FilterElement *fe) @@ -236,7 +238,7 @@ static GtkWidget *get_widget(FilterElement *fe) entry = (GtkEntry *)gtk_entry_new(); if (fi->values && fi->values->data) { - gtk_entry_set_text(entry, fi->values->data); + e_utf8_gtk_entry_set_text(entry, fi->values->data); } gtk_signal_connect((GtkObject *)entry, "changed", entry_changed, fe); return (GtkWidget *)entry; diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 39012b9e54..21aa5ed396 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -22,6 +22,8 @@ #include #include +#include + #include "filter-rule.h" #include "filter-context.h" @@ -454,7 +456,7 @@ static void name_changed(GtkEntry *entry, FilterRule *fr) { g_free(fr->name); - fr->name = g_strdup(gtk_entry_get_text(entry)); + fr->name = e_utf8_gtk_entry_get_text(entry); } GtkWidget *filter_rule_get_widget (FilterRule *fr, struct _RuleContext *f) @@ -482,7 +484,7 @@ static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f) label = (GtkLabel *)gtk_label_new("Name"); name = (GtkEntry *)gtk_entry_new(); if (fr->name) - gtk_entry_set_text(name, fr->name); + e_utf8_gtk_entry_set_text(name, fr->name); hbox = (GtkHBox *)gtk_hbox_new(FALSE, 3); gtk_box_pack_start((GtkBox *)hbox, (GtkWidget *)label, FALSE, FALSE, 0); gtk_box_pack_start((GtkBox *)hbox, (GtkWidget *)name, TRUE, TRUE, 0); -- cgit v1.2.3