diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-04-13 03:55:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-13 03:55:53 +0800 |
| commit | 51e5ae5524c778309800530e1e25fdf74f2226da (patch) | |
| tree | cb4b49e313d0ac80d9b47c3f2ffe6e097fe08442 /mail/em-format-html-display.c | |
| parent | 742b2d946553f3317a7cecc21f735441c37e4478 (diff) | |
| download | gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.tar gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.tar.gz gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.tar.bz2 gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.tar.lz gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.tar.xz gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.tar.zst gsoc2013-evolution-51e5ae5524c778309800530e1e25fdf74f2226da.zip | |
Adapt to Camel API changes.
Diffstat (limited to 'mail/em-format-html-display.c')
| -rw-r--r-- | mail/em-format-html-display.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 54a768ec59..cca924ac9f 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -463,11 +463,12 @@ efhd_format_optional (EMFormat *emf, { gchar *classid, *html; struct _attach_puri *info; - CamelStream *stream; + CamelStream *stream = NULL; - if (CAMEL_IS_STREAM_FILTER (fstream) && ((CamelStreamFilter *) fstream)->source) - stream = ((CamelStreamFilter *) fstream)->source; - else + if (CAMEL_IS_STREAM_FILTER (fstream)) + stream = camel_stream_filter_get_source ( + CAMEL_STREAM_FILTER (fstream)); + if (stream == NULL) stream = fstream; classid = g_strdup_printf ("optional%s", emf->part_id->str); @@ -970,6 +971,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb GtkWidget *view; GtkAllocation allocation; GtkTextBuffer *buffer; + GByteArray *byte_array; /* FIXME: handle default shown case */ d(printf("adding attachment button/content for optional rendering\n")); @@ -1027,7 +1029,9 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (view)); - gtk_text_buffer_set_text (buffer, (gchar *)info->mstream->buffer->data, info->mstream->buffer->len); + byte_array = camel_stream_mem_get_byte_array (info->mstream); + gtk_text_buffer_set_text ( + buffer, (gchar *) byte_array->data, byte_array->len); camel_object_unref(info->mstream); info->mstream = NULL; gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), |