diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-08 23:04:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-28 23:35:55 +0800 |
| commit | a91eeb647138ee035444cdc3c265fa4e95898f29 (patch) | |
| tree | 63b5712bc407630d6ad6e504244e6cc4ebc35a86 /plugins/mark-all-read/mark-all-read.c | |
| parent | 2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff) | |
| download | gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.gz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.zst gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.zip | |
Pass GCancellable to Camel.
Diffstat (limited to 'plugins/mark-all-read/mark-all-read.c')
| -rw-r--r-- | plugins/mark-all-read/mark-all-read.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 5649bd8661..10d0eae5e9 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -348,18 +348,20 @@ mark_all_as_read (CamelFolder *folder) static gboolean mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, + GCancellable *cancellable, GError **error) { while (fi) { CamelFolder *folder; if (fi->child) { - if (!mar_all_sub_folders (store, fi->child, error)) + if (!mar_all_sub_folders ( + store, fi->child, cancellable, error)) return FALSE; } folder = camel_store_get_folder ( - store, fi->full_name, 0, error); + store, fi->full_name, 0, cancellable, error); if (folder == NULL) return FALSE; @@ -389,10 +391,11 @@ mar_got_folder (gchar *folder_uri, full_name = camel_folder_get_full_name (folder); parent_store = camel_folder_get_parent_store (folder); + /* FIXME Not passing a GCancellable or GError here. */ folder_info = camel_store_get_folder_info ( parent_store, full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | - CAMEL_STORE_FOLDER_INFO_FAST, NULL); + CAMEL_STORE_FOLDER_INFO_FAST, NULL, NULL); if (folder_info == NULL) goto exit; @@ -405,7 +408,8 @@ mar_got_folder (gchar *folder_uri, if (response == MARK_ALL_READ_CURRENT_FOLDER) mark_all_as_read (folder); else if (response == MARK_ALL_READ_WITH_SUBFOLDERS) - mar_all_sub_folders (parent_store, folder_info, NULL); + /* FIXME Not passing a GCancellable or GError here. */ + mar_all_sub_folders (parent_store, folder_info, NULL, NULL); exit: camel_store_free_folder_info (parent_store, folder_info); |