diff options
| author | Jeffrey Stedfast <fejj@helixcode.com> | 2000-09-12 05:38:50 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-09-12 05:38:50 +0800 |
| commit | a24f5d36acd3e55a1a5928339e895173cd517ed0 (patch) | |
| tree | e5d4ef8cb34a522e134e908a649c2e6a3833a99d | |
| parent | ca9ab0c63bc468566064505263088649064993a6 (diff) | |
| download | gsoc2013-evolution-a24f5d36acd3e55a1a5928339e895173cd517ed0.tar.gz gsoc2013-evolution-a24f5d36acd3e55a1a5928339e895173cd517ed0.tar.zst gsoc2013-evolution-a24f5d36acd3e55a1a5928339e895173cd517ed0.zip | |
No longer takes a self_destruct argument.
2000-09-11 Jeffrey Stedfast <fejj@helixcode.com>
* filter-driver.c (filter_driver_run): No longer takes a
self_destruct argument.
svn path=/trunk/; revision=5348
| -rw-r--r-- | filter/ChangeLog | 5 | ||||
| -rw-r--r-- | filter/filter-driver.c | 8 | ||||
| -rw-r--r-- | filter/filter-driver.h | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 084b7833d4..26ae85b3b1 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,5 +1,10 @@ 2000-09-11 Jeffrey Stedfast <fejj@helixcode.com> + * filter-driver.c (filter_driver_run): No longer takes a + self_destruct argument. + +2000-09-11 Jeffrey Stedfast <fejj@helixcode.com> + * filter-driver.c (filter_driver_run): Don't freeze/thaw the default inbox here, let the caller freeze/thaw it. Don't destroy the folders hash table here, it's faster if we wait till the diff --git a/filter/filter-driver.c b/filter/filter-driver.c index 257869081d..3cd527664d 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -401,8 +401,7 @@ free_key (gpointer key, gpointer value, gpointer user_data) gboolean filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info, - CamelFolder *inbox, enum _filter_source_t sourcetype, - gboolean self_destruct, CamelException *ex) + CamelFolder *inbox, enum _filter_source_t sourcetype, CamelException *ex) { struct _FilterDriverPrivate *p = _PRIVATE (driver); ESExpResult *r; @@ -412,6 +411,7 @@ filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelMessage gtk_object_ref (GTK_OBJECT (driver)); camel_object_ref (CAMEL_OBJECT (message)); + if (inbox) camel_object_ref (CAMEL_OBJECT (inbox)); @@ -483,8 +483,8 @@ filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelMessage camel_object_unref (CAMEL_OBJECT (message)); if (inbox) camel_object_unref (CAMEL_OBJECT (inbox)); - if (self_destruct) - gtk_object_unref (GTK_OBJECT (driver)); + + gtk_object_unref (GTK_OBJECT (driver)); return filtered; } diff --git a/filter/filter-driver.h b/filter/filter-driver.h index 7c7c8fe89c..d6a8e2057b 100644 --- a/filter/filter-driver.h +++ b/filter/filter-driver.h @@ -55,8 +55,7 @@ FilterDriver *filter_driver_new (FilterContext *ctx, FilterGetFolderFunc fe /* filter a message - returns TRUE if the message was filtered into some location other than inbox */ gboolean filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info, - CamelFolder *inbox, enum _filter_source_t sourcetype, - gboolean self_destruct, CamelException *ex); + CamelFolder *inbox, enum _filter_source_t sourcetype, CamelException *ex); #if 0 /* generate the search query/action string for a filter option */ |