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/e-mail-reader.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/e-mail-reader.c')
| -rw-r--r-- | mail/e-mail-reader.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index abfbf3b0ab..795dfcd40f 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1789,7 +1789,7 @@ mail_reader_message_loaded_cb (CamelFolder *folder, const gchar *message_uid, CamelMimeMessage *message, gpointer user_data, - CamelException *ex) + GError **error) { EMailReader *reader = user_data; EMailReaderPrivate *priv; @@ -1874,24 +1874,19 @@ mail_reader_message_loaded_cb (CamelFolder *folder, timeout_interval, (GSourceFunc) mail_reader_message_read_cb, reader); - } else if (camel_exception_is_set (ex)) { + } else if (error != NULL && *error != NULL) { gchar *string; - if (ex->id != CAMEL_EXCEPTION_OPERATION_IN_PROGRESS) { - /* Display the error inline and clear the exception. */ - string = g_strdup_printf ( - "<h2>%s</h2><p>%s</p>", - _("Unable to retrieve message"), - ex->desc); - } else { - string = g_strdup_printf ( - _("Retrieving message '%s'"), cursor_uid); - } + /* Display the error inline and clear the exception. */ + string = g_strdup_printf ( + "<h2>%s</h2><p>%s</p>", + _("Unable to retrieve message"), + (*error)->message); e_web_view_load_string (web_view, string); g_free (string); - camel_exception_clear (ex); + g_clear_error (error); } /* We referenced this in the call to mail_get_messagex(). */ |