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-option.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-option.c')
-rw-r--r-- | filter/filter-option.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/filter/filter-option.c b/filter/filter-option.c index 8d3429ca69..8b9f008aca 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -31,7 +31,6 @@ #include <gtk/gtkoptionmenu.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> -#include <gal/widgets/e-unicode.h> #include "filter-option.h" #include "filter-part.h" @@ -199,7 +198,7 @@ xml_create (FilterElement *fe, xmlNodePtr node) { FilterOption *fo = (FilterOption *)fe; xmlNodePtr n, work; - + /* parent implementation */ FILTER_ELEMENT_CLASS (parent_class)->xml_create (fe, node); @@ -207,31 +206,34 @@ xml_create (FilterElement *fe, xmlNodePtr node) while (n) { if (!strcmp (n->name, "option")) { char *tmp, *value, *title = NULL, *code = NULL; - + value = xmlGetProp (n, "value"); work = n->childs; while (work) { if (!strcmp (work->name, "title")) { if (!title) { - tmp = xmlNodeGetContent(work); - title = e_utf8_xml1_decode(tmp); - if (tmp) - xmlFree(tmp); + if (!(tmp = xmlNodeGetContent (work))) + tmp = xmlStrdup (""); + + title = g_strdup (tmp); + xmlFree (tmp); } } else if (!strcmp (work->name, "code")) { if (!code) { - tmp = xmlNodeGetContent(work); - code = e_utf8_xml1_decode(tmp); - if (tmp) - xmlFree(tmp); + if (!(tmp = xmlNodeGetContent (work))) + tmp = xmlStrdup (""); + + code = g_strdup (tmp); + xmlFree (tmp); } } work = work->next; } - filter_option_add(fo, value, title, code); - xmlFree(value); - g_free(title); - g_free(code); + + filter_option_add (fo, value, title, code); + xmlFree (value); + g_free (title); + g_free (code); } else { g_warning ("Unknown xml node within optionlist: %s\n", n->name); } @@ -357,8 +359,8 @@ clone (FilterElement *fe) l = fo->options; while (l) { op = l->data; - filter_option_add(new, op->value, op->title, op->code); - l = g_list_next (l); + filter_option_add (new, op->value, op->title, op->code); + l = l->next; } d(printf ("cloning option code %p, current = %p\n", new, new->current)); |