aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-07-08 23:04:23 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-09-28 23:35:55 +0800
commita91eeb647138ee035444cdc3c265fa4e95898f29 (patch)
tree63b5712bc407630d6ad6e504244e6cc4ebc35a86 /modules
parent2c21832faab43a176dcb37bc2c65e9e3fb55fc9f (diff)
downloadgsoc2013-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 'modules')
-rw-r--r--modules/mail/e-mail-attachment-handler.c9
-rw-r--r--modules/mail/e-mail-shell-backend.c3
-rw-r--r--modules/mail/e-mail-shell-view.c6
3 files changed, 12 insertions, 6 deletions
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 313dddeac4..99d16e9a34 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -288,14 +288,16 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
goto exit;
/* The first string is the folder URI. */
- folder = mail_tool_uri_to_folder (data, 0, &local_error);
+ /* FIXME Not passing a GCancellable here. */
+ folder = mail_tool_uri_to_folder (data, 0, NULL, &local_error);
if (folder == NULL)
goto exit;
/* Handle one message. */
if (uids->len == 1) {
+ /* FIXME Not passing a GCancellable here. */
message = camel_folder_get_message (
- folder, uids->pdata[0], &local_error);
+ folder, uids->pdata[0], NULL, &local_error);
if (message == NULL)
goto exit;
@@ -318,8 +320,9 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
camel_multipart_set_boundary (multipart, NULL);
for (ii = 0; ii < uids->len; ii++) {
+ /* FIXME Not passing a GCancellable here. */
message = camel_folder_get_message (
- folder, uids->pdata[ii], &local_error);
+ folder, uids->pdata[ii], NULL, &local_error);
if (message == NULL) {
g_object_unref (multipart);
goto exit;
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index f1696692dd..24d3ecab58 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -795,5 +795,6 @@ mbox_fill_preview_cb (GObject *preview, CamelMimeMessage *msg)
format = g_object_get_data (preview, "mbox-imp-formatter");
g_return_if_fail (format != NULL);
- em_format_format (EM_FORMAT (format), NULL, NULL, msg);
+ /* FIXME Not passing a GCancellable here. */
+ em_format_format (EM_FORMAT (format), NULL, NULL, msg, NULL);
}
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 3e58330d93..f6603446ea 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -563,7 +563,8 @@ all_accounts:
iter = mail_vfolder_get_sources_local ();
while (iter != NULL) {
folder_uri = iter->data;
- folder = mail_tool_uri_to_folder (folder_uri, 0, NULL);
+ /* FIXME Not passing a GCancellable or GError here. */
+ folder = mail_tool_uri_to_folder (folder_uri, 0, NULL, NULL);
if (folder != NULL)
list = g_list_append (list, folder);
@@ -577,7 +578,8 @@ all_accounts:
iter = mail_vfolder_get_sources_remote ();
while (iter != NULL) {
folder_uri = iter->data;
- folder = mail_tool_uri_to_folder (folder_uri, 0, NULL);
+ /* FIXME Not passing a GCancellable or GError here. */
+ folder = mail_tool_uri_to_folder (folder_uri, 0, NULL, NULL);
if (folder != NULL)
list = g_list_append (list, folder);