aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-04-14 00:09:07 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:54 +0800
commitfec408b4c5f8059400ba90ead05d1692083cc97a (patch)
treebbfcc5d36d07ccd17d27a7a94c8f54adbe8e87af
parent871f4af414925cfaf9548b2d5043407c54ad1916 (diff)
downloadgsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.tar
gsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.tar.gz
gsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.tar.bz2
gsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.tar.lz
gsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.tar.xz
gsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.tar.zst
gsoc2013-evolution-fec408b4c5f8059400ba90ead05d1692083cc97a.zip
Demonstrate EWebView as an EAlertSink.
-rw-r--r--mail/e-mail-reader.c15
-rw-r--r--mail/mail.error.xml5
2 files changed, 9 insertions, 11 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index c288db023e..30480fb1d6 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2706,17 +2706,10 @@ mail_reader_message_loaded_cb (CamelFolder *folder,
mail_reader_closure_free);
} else if (error != NULL) {
- gchar *string;
-
- /* 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);
-
+ e_alert_submit (
+ E_ALERT_SINK (web_view),
+ "mail:no-retrieve-message",
+ error->message, NULL);
g_error_free (error);
}
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 709b572cbb..7f07bb9cbe 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -500,5 +500,10 @@ An mbox account will be created to preserve the old mbox folders. You can delete
<_primary>Failed to unsubscribe from folder.</_primary>
<_secondary>The reported error was &quot;{0}&quot;.</_secondary>
</error>
+
+ <error id="no-retrieve-message" type="warning">
+ <_primary>Unable to retrieve message.</_primary>
+ <_secondary xml:space="preserve">{0}</_secondary>
+ </error>
</error-list>