From 35a998b2de7d3127ea802a9284f2b5ab44df1de6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 13 Apr 2011 12:09:07 -0400
Subject: Demonstrate EWebView as an EAlertSink.

---
 mail/e-mail-reader.c | 15 ++++-----------
 mail/mail.error.xml  |  5 +++++
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'mail')

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>
 
-- 
cgit v1.2.3