From 550efe7b4a8681709e67f44258649f02c8580bb4 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 25 Jul 2012 22:14:43 -0400
Subject: mail.error.xml: Remove "mail:session-message-*" errors.

Use "system:simple-info/warning/error" errors instead.
---
 mail/e-mail-config-assistant.c |  2 +-
 mail/e-mail-config-window.c    |  2 +-
 mail/e-mail-ui-session.c       |  6 +++---
 mail/mail.error.xml            | 12 ------------
 4 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'mail')

diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index 680463c76d..407d076f80 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -325,7 +325,7 @@ mail_config_assistant_close_cb (GObject *object,
 	} else if (error != NULL) {
 		e_alert_submit (
 			E_ALERT_SINK (assistant),
-			"mail:session-message-error",
+			"system:simple-error",
 			error->message, NULL);
 		g_error_free (error);
 
diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c
index 5e8262ac6b..5062abca35 100644
--- a/mail/e-mail-config-window.c
+++ b/mail/e-mail-config-window.c
@@ -162,7 +162,7 @@ mail_config_window_commit_cb (GObject *object,
 	} else if (error != NULL) {
 		e_alert_submit (
 			E_ALERT_SINK (window),
-			"mail:session-message-error",
+			"system:simple-error",
 			error->message, NULL);
 		g_object_unref (window);
 		g_error_free (error);
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index 37a5e50d43..7476a3521a 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -186,13 +186,13 @@ user_message_exec (struct _user_message_msg *m,
 
 	switch (m->type) {
 		case CAMEL_SESSION_ALERT_INFO:
-			error_type = "mail:session-message-info";
+			error_type = "system:simple-info";
 			break;
 		case CAMEL_SESSION_ALERT_WARNING:
-			error_type = "mail:session-message-warning";
+			error_type = "system:simple-warning";
 			break;
 		case CAMEL_SESSION_ALERT_ERROR:
-			error_type = "mail:session-message-error";
+			error_type = "system:simple-error";
 			break;
 		default:
 			error_type = NULL;
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 3ff85ade1d..5361ed974a 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -136,18 +136,6 @@ Many email systems add an Apparently-To header to messages that only have BCC re
     <secondary>{0}</secondary>
   </error>
 
-  <error id="session-message-info" type="info">
-    <secondary>{0}</secondary>
-  </error>
-
-  <error id="session-message-warning" type="warning">
-    <secondary>{0}</secondary>
-  </error>
-
-  <error id="session-message-error" type="error">
-    <secondary>{0}</secondary>
-  </error>
-
   <error id="ask-session-password" type="question" default="GTK_RESPONSE_OK">
     <_primary>Enter password.</_primary>
     <secondary>{0}</secondary>
-- 
cgit v1.2.3