diff options
author | Christopher James Lahey <clahey@ximian.com> | 2002-03-13 15:10:22 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2002-03-13 15:10:22 +0800 |
commit | abd6567ea011ed5546aa8b17bea86567ad9fb5f7 (patch) | |
tree | b62808ef22f53beba97f22a50f3f9bd96d74aeda /e-util | |
parent | e03e086323ba306b53f27f6e9e95d4c627a51717 (diff) | |
download | gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.tar gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.tar.gz gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.tar.bz2 gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.tar.lz gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.tar.xz gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.tar.zst gsoc2013-evolution-abd6567ea011ed5546aa8b17bea86567ad9fb5f7.zip |
Replaced e_marshal_BOOL__STRING with this since the function it was used
2002-03-13 Christopher James Lahey <clahey@ximian.com>
* gal/util/e-util.c, gal/util/e-util.h
(e_marshal_BOOL__STRING_INT): Replaced e_marshal_BOOL__STRING with
this since the function it was used for has been modified.
From gal/e-table/ChangeLog:
2002-03-13 Christopher James Lahey <clahey@ximian.com>
* e-table-extras.c (e_string_search): Check for a NULL haystack
here.
* e-table-search.c, e-table-search.h: Added a parameter to the
search signal here to pass in flags. Specifically, added the
E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST flag. Improved the search
behavior here.
* e-table.c, e-tree.c: Handle the new signature for the search
signal here.
svn path=/trunk/; revision=16139
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/e-util.c | 22 | ||||
-rw-r--r-- | e-util/e-util.h | 4 |
2 files changed, 15 insertions, 11 deletions
diff --git a/e-util/e-util.c b/e-util/e-util.c index 9e4cc74412..1696338858 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -834,24 +834,26 @@ e_marshal_NONE__DOUBLE (GtkObject *object, func_data); } -typedef gboolean (*GtkSignal_BOOL__STRING) (GtkObject *, - char *, - gpointer user_data); +typedef gboolean (*GtkSignal_BOOL__STRING_INT) (GtkObject *, + char *, + gint, + gpointer user_data); void -e_marshal_BOOL__STRING (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) +e_marshal_BOOL__STRING_INT (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args) { - GtkSignal_BOOL__STRING rfunc; + GtkSignal_BOOL__STRING_INT rfunc; gboolean *return_val; - rfunc = (GtkSignal_BOOL__STRING) func; - return_val = GTK_RETLOC_BOOL (args[1]); + rfunc = (GtkSignal_BOOL__STRING_INT) func; + return_val = GTK_RETLOC_BOOL (args[2]); *return_val = (*rfunc) (object, GTK_VALUE_STRING (args[0]), + GTK_VALUE_INT (args[1]), func_data); } diff --git a/e-util/e-util.h b/e-util/e-util.h index 7c0abe9da9..e636a0fbbf 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -277,7 +277,9 @@ void e_marshal_NONE__DOUBLE (GtkO GtkSignalFunc func, gpointer func_data, GtkArg *args); -void e_marshal_BOOL__STRING (GtkObject *object, + +#define e_marshal_BOOL__STRING_ENUM e_marshal_BOOL__STRING_INT +void e_marshal_BOOL__STRING_INT (GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args); |