diff options
Diffstat (limited to 'camel/camel-filter-driver.c')
| -rw-r--r-- | camel/camel-filter-driver.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c index ff6a8a88d2..cb968f20c8 100644 --- a/camel/camel-filter-driver.c +++ b/camel/camel-filter-driver.c @@ -254,7 +254,7 @@ camel_filter_driver_finalise (CamelObject *obj) if (p->defaultfolder) { camel_folder_thaw (p->defaultfolder); - camel_object_unref (p->defaultfolder); + camel_object_unref (CAMEL_OBJECT (p->defaultfolder)); } while ((node = (struct _filter_rule *)e_dlist_remhead(&p->rules))) { @@ -345,14 +345,14 @@ camel_filter_driver_set_default_folder (CamelFilterDriver *d, CamelFolder *def) if (p->defaultfolder) { camel_folder_thaw (p->defaultfolder); - camel_object_unref (p->defaultfolder); + camel_object_unref (CAMEL_OBJECT (p->defaultfolder)); } p->defaultfolder = def; if (p->defaultfolder) { camel_folder_freeze (p->defaultfolder); - camel_object_ref (p->defaultfolder); + camel_object_ref (CAMEL_OBJECT (p->defaultfolder)); } } @@ -809,7 +809,6 @@ pipe_message (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilte return NULL; } - static ESExpResult * do_shell (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver) { @@ -934,7 +933,7 @@ close_folder (void *key, void *value, void *data) if (folder != FOLDER_INVALID) { camel_folder_sync (folder, FALSE, p->ex); camel_folder_thaw (folder); - camel_object_unref (folder); + camel_object_unref (CAMEL_OBJECT (folder)); } report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, g_hash_table_size(p->folders)* 100 / p->closed, _("Syncing folders")); @@ -1141,7 +1140,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, co if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) { camel_exception_set (ex, (errno==EINTR)?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_SYSTEM, _("Cannot open message")); report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d"), i); - camel_object_unref (msg); + camel_object_unref (CAMEL_OBJECT (msg)); goto fail; } @@ -1150,7 +1149,7 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, co last = camel_mime_parser_tell(mp); status = camel_filter_driver_filter_message (driver, msg, info, NULL, NULL, source_url, original_source_url ? original_source_url : source_url, ex); - camel_object_unref (msg); + camel_object_unref (CAMEL_OBJECT (msg)); if (camel_exception_is_set (ex) || status == -1) { report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d"), i); camel_message_info_free (info); @@ -1178,7 +1177,7 @@ fail: if (fd != -1) close (fd); if (mp) - camel_object_unref (mp); + camel_object_unref (CAMEL_OBJECT (mp)); return -1; } @@ -1352,7 +1351,7 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage struct _camel_header_raw *h; if (message) { - camel_object_ref (message); + camel_object_ref (CAMEL_OBJECT (message)); } else { message = camel_folder_get_message (source, uid, ex); if (!message) @@ -1369,7 +1368,7 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage uid = camel_message_info_uid (info); if (message) - camel_object_ref (message); + camel_object_ref (CAMEL_OBJECT (message)); } p->ex = ex; @@ -1458,7 +1457,7 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage } if (p->message) - camel_object_unref (p->message); + camel_object_unref (CAMEL_OBJECT (p->message)); if (freeinfo) camel_message_info_free (info); @@ -1470,7 +1469,7 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage camel_filter_driver_log (driver, FILTER_LOG_END, NULL); if (p->message) - camel_object_unref (p->message); + camel_object_unref (CAMEL_OBJECT (p->message)); if (freeinfo) camel_message_info_free (info); |