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/prefer-plain/prefer-plain.c | |
| 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/prefer-plain/prefer-plain.c')
| -rw-r--r-- | plugins/prefer-plain/prefer-plain.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 630b5e3ab4..f82a217f9a 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -66,9 +66,13 @@ make_part_attachment (EMFormat *format, CamelStream *stream, CamelMimePart *part g_free (str); } - em_format_part_as (format, stream, part, "application/octet-stream"); + /* FIXME Not passing a GCancellable here. */ + em_format_part_as ( + format, stream, part, + "application/octet-stream", NULL); } else - em_format_part (format, stream, part); + /* FIXME Not passing a GCancellable here. */ + em_format_part (format, stream, part, NULL); g_string_truncate (format->part_id, partidlen); } @@ -80,7 +84,10 @@ org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t) if (epp_mode != EPP_TEXT || strstr (t->format->part_id->str, ".alternative-prefer-plain.") != NULL || em_format_is_inline (t->format, t->format->part_id->str, t->part, &(t->item->handler))) - t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); + /* FIXME Not passing a GCancellable here. */ + t->item->handler.old->handler ( + t->format, t->stream, t->part, + t->item->handler.old, NULL, FALSE); else if (epp_show_suppressed) make_part_attachment (t->format, t->stream, t->part, -1); } @@ -155,10 +162,16 @@ org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t if (display_part && have_plain && nparts == 2) { g_string_append_printf (t->format->part_id, ".alternative-prefer-plain.%d", displayid); - em_format_part_as (t->format, t->stream, display_part, "text/html"); + /* FIXME Not passing a GCancellable here. */ + em_format_part_as ( + t->format, t->stream, + display_part, "text/html", NULL); g_string_truncate (t->format->part_id, partidlen); } else { - t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); + /* FIXME Not passing a GCancellable here. */ + t->item->handler.old->handler ( + t->format, t->stream, t->part, + t->item->handler.old, NULL, FALSE); } return; } else if (!CAMEL_IS_MULTIPART (mp)) { @@ -179,7 +192,10 @@ org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t /* if we found a text part, show it */ if (display_part) { g_string_append_printf(t->format->part_id, ".alternative-prefer-plain.%d", displayid); - em_format_part_as(t->format, t->stream, display_part, "text/plain"); + /* FIXME Not passing a GCancellable here. */ + em_format_part_as ( + t->format, t->stream, + display_part, "text/plain", NULL); g_string_truncate (t->format->part_id, partidlen); } |