diff options
| author | Not Zed <NotZed@Ximian.com> | 2002-01-15 10:26:10 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2002-01-15 10:26:10 +0800 |
| commit | d636d53bc9af47f29681c6ec340745b511af4281 (patch) | |
| tree | af864abed45a4d0365bbfb68d952ee64e1ab9469 | |
| parent | 4e788c6fec759cdf2c295df8759a1612fcfa665c (diff) | |
| download | gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.tar gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.tar.gz gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.tar.bz2 gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.tar.lz gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.tar.xz gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.tar.zst gsoc2013-evolution-d636d53bc9af47f29681c6ec340745b511af4281.zip | |
If we write "" to an xml file, we read back NULL. So if we read back NULL,
2002-01-15 Not Zed <NotZed@Ximian.com>
* filter-input.c (xml_decode): If we write "" to an xml file, we
read back NULL. So if we read back NULL, convert it to "".
Sigh. This makes a fix for #7801, although new gui may also be
required.
svn path=/trunk/; revision=15326
| -rw-r--r-- | filter/ChangeLog | 7 | ||||
| -rw-r--r-- | filter/filter-input.c | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 2e8788bd8c..76a439ced6 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,10 @@ +2002-01-15 Not Zed <NotZed@Ximian.com> + + * filter-input.c (xml_decode): If we write "" to an xml file, we + read back NULL. So if we read back NULL, convert it to "". + Sigh. This makes a fix for #7801, although new gui may also be + required. + 2002-01-03 Jeffrey Stedfast <fejj@ximian.com> * filter-source.c (filter_source_get_sources): Get the account diff --git a/filter/filter-input.c b/filter/filter-input.c index 165d16b10c..2252f95157 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -37,7 +37,7 @@ #include "filter-input.h" #include "e-util/e-sexp.h" -#define d(x) +#define d(x) static gboolean validate (FilterElement *fe); static void xml_create(FilterElement *fe, xmlNodePtr node); @@ -276,9 +276,11 @@ xml_decode (FilterElement *fe, xmlNodePtr node) if (str) { decstr = e_utf8_xml1_decode (str); xmlFree (str); - d(printf (" '%s'\n", decstr)); - fi->values = g_list_append (fi->values, decstr); - } + } else + decstr = g_strdup(""); + + d(printf (" '%s'\n", decstr)); + fi->values = g_list_append (fi->values, decstr); } else { g_warning ("Unknown node type '%s' encountered decoding a %s\n", n->name, type); } |