diff options
| author | Jeffrey Stedfast <fejj@helixcode.com> | 2000-09-08 04:38:32 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-09-08 04:38:32 +0800 |
| commit | 58eb7bf31c146cb0fcf3a08062d9920f92c04674 (patch) | |
| tree | 4e0606d53a606da827d101d550b4d025ec009b5b | |
| parent | 1b3a2114eed8a2d2fee8fa0ad3056d5685730c25 (diff) | |
| download | gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.tar gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.tar.gz gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.tar.bz2 gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.tar.lz gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.tar.xz gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.tar.zst gsoc2013-evolution-58eb7bf31c146cb0fcf3a08062d9920f92c04674.zip | |
Rewrote - this shouldn't need to be an async function
2000-09-07 Jeffrey Stedfast <fejj@helixcode.com>
* filter-driver.c (filter_driver_run): Rewrote - this shouldn't
need to be an async function
* filter-message-search.c (match_all): Modified to look at the
boolean value being fed to it and just to return that instead of
always returning TRUE
svn path=/trunk/; revision=5241
| -rw-r--r-- | filter/filter-driver.c | 10 | ||||
| -rw-r--r-- | filter/filter-driver.h | 7 | ||||
| -rw-r--r-- | filter/filtertypes.xml | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/filter/filter-driver.c b/filter/filter-driver.c index cc1d08863b..0108ed02c6 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -374,9 +374,10 @@ free_key (gpointer key, gpointer value, gpointer user_data) #endif void -filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelFolder *inbox, - enum _filter_source_t sourcetype, gboolean self_destruct, - gpointer unhook_func, gpointer unhook_data) +filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, + CamelFolder *inbox, enum _filter_source_t sourcetype, + gpointer unhook_func, gpointer unhook_data, + gboolean self_destruct, CamelException *ex) { struct _FilterDriverPrivate *p = _PRIVATE (driver); ESExpResult *r; @@ -464,6 +465,9 @@ filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelFolder camel_folder_thaw (inbox); mail_tool_camel_lock_down (); + /* transfer the exception over to the parents exception */ + if (camel_exception_is_set (p->ex)) + camel_exception_xfer (ex, p->ex); camel_exception_free (p->ex); camel_object_unref (CAMEL_OBJECT (message)); diff --git a/filter/filter-driver.h b/filter/filter-driver.h index 5ab4d8a8a9..02b9f9e2b3 100644 --- a/filter/filter-driver.h +++ b/filter/filter-driver.h @@ -54,9 +54,10 @@ FilterDriver *filter_driver_new (FilterContext *ctx, FilterGetFolderFunc fe /*void filter_driver_set_global(FilterDriver *, const char *name, const char *value);*/ /* apply rules to a folder, unmatched messages goto inbox, if not NULL */ -void filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelFolder *inbox, - enum _filter_source_t sourcetype, - gboolean self_destruct, gpointer unhook_func, gpointer unhook_data); +void filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, + CamelFolder *inbox, enum _filter_source_t sourcetype, + gpointer unhook_func, gpointer unhook_data, + gboolean self_destruct, CamelException *ex); #if 0 /* generate the search query/action string for a filter option */ diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml index 0c38ce575c..09daea6de1 100644 --- a/filter/filtertypes.xml +++ b/filter/filtertypes.xml @@ -170,8 +170,3 @@ </part> </actionset> </filterdescription> - - - - - |