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/templates | |
| parent | 2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff) | |
| download | gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.gz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.bz2 gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.lz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.xz gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.tar.zst gsoc2013-evolution-a91eeb647138ee035444cdc3c265fa4e95898f29.zip | |
Pass GCancellable to Camel.
Diffstat (limited to 'plugins/templates')
| -rw-r--r-- | plugins/templates/templates.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 6b0857875e..83dd985402 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -565,8 +565,9 @@ build_template_menus_recurse (GtkUIManager *ui_manager, gchar *path; guint ii; + /* FIXME Not passing a GCancellable or GError here. */ folder = camel_store_get_folder ( - store, folder_info->full_name, 0, NULL); + store, folder_info->full_name, 0, NULL, NULL); folder_name = camel_folder_get_name (folder); action_name = g_strdup_printf ( @@ -612,7 +613,9 @@ build_template_menus_recurse (GtkUIManager *ui_manager, if (flags & CAMEL_MESSAGE_DELETED) continue; - template = camel_folder_get_message (folder, uid, NULL); + /* FIXME Not passing a GCancellable or GError here. */ + template = camel_folder_get_message ( + folder, uid, NULL, NULL); g_object_ref (template); action_label = @@ -764,10 +767,11 @@ update_actions_cb (EShellView *shell_view) templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES); full_name = camel_folder_get_full_name (templates_folder); + /* FIXME Not passing a GCancellable or GError here. */ folder_info = camel_store_get_folder_info ( store, full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | - CAMEL_STORE_FOLDER_INFO_FAST, NULL); + CAMEL_STORE_FOLDER_INFO_FAST, NULL, NULL); build_template_menus_recurse ( ui_manager, action_group, |