diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2002-11-06 06:51:55 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-11-06 06:51:55 +0800 |
commit | c7f67942ca864e5d158102eab7f26f6285a05b05 (patch) | |
tree | 2a14cae4df16ab9b0019edd6098abec3d75bd1e7 /filter/filter-input.c | |
parent | 394f4bee4a7a2fe5f12cb96b636aca99abd11184 (diff) | |
download | gsoc2013-evolution-c7f67942ca864e5d158102eab7f26f6285a05b05.tar.gz gsoc2013-evolution-c7f67942ca864e5d158102eab7f26f6285a05b05.tar.zst gsoc2013-evolution-c7f67942ca864e5d158102eab7f26f6285a05b05.zip |
Ported.
2002-11-05 Jeffrey Stedfast <fejj@ximian.com>
* filter-filter.c: Ported.
* filter-source.c (get_widget): Don't use e_utf8_to_gtk_string.
* filter-option.c (xml_create): Don't use e_utf8_xml1_decode.
* filter-input.c (xml_encode): Don't use e_utf8_xml1_encode.
(xml_decode): Don't use e_utf8_xml1_decode.
(entry_changed): Don't use e_utf8_gtk_entry_get_text.
(get_widget): Don't use e_utf8_gtk_entry_set_text.
* filter-file.c (xml_encode): Don't use e_utf8_xml1_encode shit.
(xml_decode): Don't use e_utf8_xml1_decode.
(entry_changed): Don't use e_utf8_gtk_entry_get_text.
(get_widget): Don't use e_utf8_gtk_entry_set_text.
svn path=/trunk/; revision=18570
Diffstat (limited to 'filter/filter-input.c')
-rw-r--r-- | filter/filter-input.c | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/filter/filter-input.c b/filter/filter-input.c index 693c56fef0..59e34d3664 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -34,7 +34,6 @@ #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> -#include <gal/widgets/e-unicode.h> #include "filter-input.h" #include "e-util/e-sexp.h" @@ -255,15 +254,12 @@ xml_encode (FilterElement *fe) xmlSetProp (value, "type", type); l = fi->values; while (l) { - xmlNodePtr cur; + xmlNodePtr cur; char *str = l->data; - char *encstr; cur = xmlNewChild (value, NULL, type, NULL); - encstr = e_utf8_xml1_encode (str); - xmlNodeSetContent (cur, encstr); - g_free (encstr); - l = g_list_next (l); + xmlNodeSetContent (cur, str); + l = l->next; } return value; @@ -288,16 +284,12 @@ xml_decode (FilterElement *fe, xmlNodePtr node) n = node->childs; while (n) { if (!strcmp (n->name, type)) { - gchar *decstr; - str = xmlNodeGetContent (n); - if (str) { - decstr = e_utf8_xml1_decode (str); - xmlFree (str); - } else - decstr = g_strdup(""); + if (!(str = xmlNodeGetContent (n))) + str = xmlStrdup (""); - d(printf (" '%s'\n", decstr)); - fi->values = g_list_append (fi->values, decstr); + d(printf (" '%s'\n", str)); + fi->values = g_list_append (fi->values, g_strdup (str)); + xmlFree (str); } else { g_warning ("Unknown node type '%s' encountered decoding a %s\n", n->name, type); } @@ -310,22 +302,22 @@ xml_decode (FilterElement *fe, xmlNodePtr node) static void entry_changed (GtkEntry *entry, FilterElement *fe) { - char *new; - FilterInput *fi = (FilterInput *)fe; + FilterInput *fi = (FilterInput *) fe; + const char *new; GList *l; - new = e_utf8_gtk_entry_get_text (entry); + new = gtk_entry_get_text (entry); /* NOTE: entry only supports a single value ... */ l = fi->values; while (l) { g_free (l->data); - l = g_list_next (l); + l = l->next; } g_list_free (fi->values); - fi->values = g_list_append (NULL, new); + fi->values = g_list_append (NULL, g_strdup (new)); } static GtkWidget * @@ -335,9 +327,8 @@ get_widget (FilterElement *fe) FilterInput *fi = (FilterInput *)fe; entry = gtk_entry_new (); - if (fi->values && fi->values->data) { - e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), fi->values->data); - } + if (fi->values && fi->values->data) + gtk_entry_set_text (GTK_ENTRY (entry), (const char *) fi->values->data); g_signal_connect (entry, "changed", entry_changed, fe); @@ -353,12 +344,12 @@ build_code (FilterElement *fe, GString *out, struct _FilterPart *ff) static void format_sexp (FilterElement *fe, GString *out) { + FilterInput *fi = (FilterInput *) fe; GList *l; - FilterInput *fi = (FilterInput *)fe; l = fi->values; while (l) { e_sexp_encode_string (out, l->data); - l = g_list_next (l); + l = l->next; } } |