diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-05 05:40:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-09 02:37:52 +0800 |
| commit | 137b0743ddfbd3bbc01c9813615ede91ddd9b954 (patch) | |
| tree | 1d8e09ba0239eff419d432bdd8d5b521fbb727ba /mail/em-html-stream.c | |
| parent | 36f1f29b9a42c56a619e031b045db5a18f2b1dd7 (diff) | |
| download | gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.gz gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.bz2 gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.lz gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.xz gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.tar.zst gsoc2013-evolution-137b0743ddfbd3bbc01c9813615ede91ddd9b954.zip | |
Migrate from CamelException to GError.
Diffstat (limited to 'mail/em-html-stream.c')
| -rw-r--r-- | mail/em-html-stream.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index d86e2a3cb4..f74ba8d98b 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <gtk/gtk.h> +#include <glib/gi18n-lib.h> #include "em-html-stream.h" #define d(x) @@ -63,19 +64,24 @@ html_stream_dispose (GObject *object) if (emhs->html_stream) { /* set 'in finalise' flag */ - camel_stream_close (CAMEL_STREAM (emhs)); + camel_stream_close (CAMEL_STREAM (emhs), NULL); } } static gssize html_stream_sync_write (CamelStream *stream, const gchar *buffer, - gsize n) + gsize n, + GError **error) { EMHTMLStream *emhs = EM_HTML_STREAM (stream); - if (emhs->html == NULL) + if (emhs->html == NULL) { + g_set_error ( + error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, + _("No HTML stream available")); return -1; + } if (emhs->html_stream == NULL) emhs->html_stream = gtk_html_begin_full ( @@ -87,12 +93,17 @@ html_stream_sync_write (CamelStream *stream, } static gint -html_stream_sync_flush (CamelStream *stream) +html_stream_sync_flush (CamelStream *stream, + GError **error) { EMHTMLStream *emhs = (EMHTMLStream *)stream; - if (emhs->html_stream == NULL) + if (emhs->html_stream == NULL) { + g_set_error ( + error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, + _("No HTML stream available")); return -1; + } gtk_html_flush (emhs->html); @@ -100,12 +111,17 @@ html_stream_sync_flush (CamelStream *stream) } static gint -html_stream_sync_close (CamelStream *stream) +html_stream_sync_close (CamelStream *stream, + GError **error) { EMHTMLStream *emhs = (EMHTMLStream *)stream; - if (emhs->html_stream == NULL) + if (emhs->html_stream == NULL) { + g_set_error ( + error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, + _("No HTML stream available")); return -1; + } gtk_html_stream_close (emhs->html_stream, GTK_HTML_STREAM_OK); html_stream_cleanup (emhs); |