diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2002-07-25 16:49:56 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-07-25 16:49:56 +0800 |
commit | 00a8f5e2ec693222e02e96c700c235a81eeb4ce5 (patch) | |
tree | d15ccbf5f6e04bfe4e85fff036cd69a52e2e3038 /filter | |
parent | 6ea2a4da8b06dd138bc815b242d6670d7c003223 (diff) | |
download | gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.tar gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.tar.gz gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.tar.bz2 gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.tar.lz gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.tar.xz gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.tar.zst gsoc2013-evolution-00a8f5e2ec693222e02e96c700c235a81eeb4ce5.zip |
Use GtkType (I only changed this one because I turned on debugging for a
2002-07-25 Jeffrey Stedfast <fejj@ximian.com>
* filter-int.[c,h]: Use GtkType (I only changed this one because I
turned on debugging for a bit).
* filter-file.c (validate): Fix the strcmp logic a bit, I had it
the exact opposite of what I really wanted. Oops :-)
svn path=/trunk/; revision=17586
Diffstat (limited to 'filter')
-rw-r--r-- | filter/ChangeLog | 8 | ||||
-rw-r--r-- | filter/filter-file.c | 7 | ||||
-rw-r--r-- | filter/filter-int.c | 10 | ||||
-rw-r--r-- | filter/filter-int.h | 2 | ||||
-rw-r--r-- | filter/filter-rule.c | 4 |
5 files changed, 24 insertions, 7 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 95b02e0d4f..ffdeedd65c 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,5 +1,13 @@ 2002-07-25 Jeffrey Stedfast <fejj@ximian.com> + * filter-int.[c,h]: Use GtkType (I only changed this one because I + turned on debugging for a bit). + + * filter-file.c (validate): Fix the strcmp logic a bit, I had it + the exact opposite of what I really wanted. Oops :-) + +2002-07-25 Jeffrey Stedfast <fejj@ximian.com> + * filter-file.c (validate): Do some minimalistic validation of command-lines (ie, make sure it isn't an empty string). diff --git a/filter/filter-file.c b/filter/filter-file.c index 14f8e04d5b..4b4eb69904 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -41,7 +41,7 @@ #include "filter-file.h" #include "e-util/e-sexp.h" -#define d(x) +#define d(x) static gboolean validate (FilterElement *fe); static int file_eq(FilterElement *fe, FilterElement *cm); @@ -183,7 +183,7 @@ validate (FilterElement *fe) /* FIXME: do more to validate command-lines? */ - if (strcmp (file->type, "file") != 0) { + if (strcmp (file->type, "file") == 0) { if (stat (file->path, &st) == -1 || !S_ISREG (st.st_mode)) { char *errmsg; @@ -195,7 +195,7 @@ validate (FilterElement *fe) gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); return FALSE; } - } else if (strcmp (file->type, "command") != 0) { + } else if (strcmp (file->type, "command") == 0) { /* only requirements so far is that the command can't be an empty string */ return file->path[0] != '\0'; @@ -270,6 +270,7 @@ xml_decode (FilterElement *fe, xmlNodePtr node) str = xmlNodeGetContent (n); if (str) { + decstr = e_utf8_xml1_decode (str); xmlFree (str); } else diff --git a/filter/filter-int.c b/filter/filter-int.c index a92b0b1b2b..d7225a9bda 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -57,10 +57,10 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -guint +GtkType filter_int_get_type (void) { - static guint type = 0; + static GtkType type = 0; if (!type) { GtkTypeInfo type_info = { @@ -203,16 +203,20 @@ xml_decode (FilterElement *fe, xmlNodePtr node) fe->name = name; type = xmlGetProp(node, "type"); + d(printf ("Type = %s\n", type)); g_free(fs->type); fs->type = g_strdup(type); xmlFree(type); intval = xmlGetProp (node, type?type:"integer"); if (intval) { + d(printf ("Value = %s\n", intval)); fs->val = atoi (intval); xmlFree (intval); - } else + } else { + d(printf ("Value = ?unknown?\n")); fs->val = 0; + } return 0; } diff --git a/filter/filter-int.h b/filter/filter-int.h index 4ed508cd36..f8cd2711c6 100644 --- a/filter/filter-int.h +++ b/filter/filter-int.h @@ -52,7 +52,7 @@ struct _FilterIntClass { /* signals */ }; -guint filter_int_get_type (void); +GtkType filter_int_get_type (void); FilterInt *filter_int_new (void); FilterInt *filter_int_new_type(const char *type, int min, int max); void filter_int_set_value(FilterInt *fi, int val); diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 4adffeaf3c..9d796a1108 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -19,7 +19,11 @@ * Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + #include <string.h> #include <glib.h> #include <gtk/gtkframe.h> |