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/tnef-attachments | |
| 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/tnef-attachments')
| -rw-r--r-- | plugins/tnef-attachments/tnef-plugin.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 03577a4667..648c48a856 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -165,9 +165,15 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) g_string_append_printf(t->format->part_id, ".tnef"); if (camel_multipart_get_number (mp) > 0) - em_format_part_as(t->format, t->stream, mainpart, "multipart/mixed"); + /* FIXME Not passing a GCancellable here. */ + em_format_part_as ( + t->format, t->stream, mainpart, + "multipart/mixed", NULL); else if (t->item->handler.old) - 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); g_string_truncate (t->format->part_id, len); @@ -177,7 +183,10 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) goto ok; fail: if (t->item->handler.old) - 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); ok: g_free (name); g_free (tmpdir); |