Rename EError to EAlert to match general use better

The EError mechanism is used both for error dialogs as well as basic alerts or
user prompts, so we should give it a more general name which matches this use.

This patch also cleans up a few includes of e-alert.h (formerly e-error.h) that
were not actually being used.

https://bugzilla.gnome.org/show_bug.cgi?id=602963

1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 9e88b356bd..c665f33227 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -45,12 +45,12 @@
 #include "mail/mail-mt.h"
 #include "mail/mail-config.h"
 #include "e-util/e-util.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "shell/e-shell-view.h"
 #include "shell/e-shell-window.h"
 #include "shell/e-shell-window-actions.h"
 
-/* EError Message IDs */
+/* EAlert Message IDs */
 #define MESSAGE_PREFIX			"org.gnome.mailing-list-actions:"
 #define MESSAGE_NO_ACTION		MESSAGE_PREFIX "no-action"
 #define MESSAGE_NO_HEADER		MESSAGE_PREFIX "no-header"
@@ -122,7 +122,7 @@ emla_list_action_do (CamelFolder *folder,
 
 	if (!header) {
 		/* there was no header matching the action */
-		e_error_run_dialog_for_args (parent, MESSAGE_NO_HEADER, NULL);
+		e_alert_run_dialog_for_args (parent, MESSAGE_NO_HEADER, NULL);
 		goto exit;
 	}
 
@@ -131,7 +131,7 @@ emla_list_action_do (CamelFolder *folder,
 	if (action == EMLA_ACTION_POST) {
 		while (*headerpos == ' ') headerpos++;
 		if (g_ascii_strcasecmp (headerpos, "NO") == 0) {
-			e_error_run_dialog_for_args (parent, MESSAGE_POSTING_NOT_ALLOWED, NULL);
+			e_alert_run_dialog_for_args (parent, MESSAGE_POSTING_NOT_ALLOWED, NULL);
 			goto exit;
 		}
 	}
@@ -141,7 +141,7 @@ emla_list_action_do (CamelFolder *folder,
 		/* skip whitespace */
 		while (*headerpos == ' ') headerpos++;
 		if (*headerpos != '<' || (end = strchr (headerpos++, '>')) == NULL) {
-			e_error_run_dialog_for_args (
+			e_alert_run_dialog_for_args (
 				parent, MESSAGE_MALFORMED_HEADER,
 				emla_action_headers[t].header, header, NULL);
 			goto exit;
@@ -154,7 +154,7 @@ emla_list_action_do (CamelFolder *folder,
 			if (emla_action_headers[t].interactive)
 				send_message_response = GTK_RESPONSE_NO;
 			else
-				send_message_response = e_error_run_dialog_for_args (
+				send_message_response = e_alert_run_dialog_for_args (
 					parent, MESSAGE_ASK_SEND_MESSAGE,
 					url, NULL);
 
@@ -188,7 +188,7 @@ emla_list_action_do (CamelFolder *folder,
 	}
 
 	/* if we got here, there's no valid action */
-	e_error_run_dialog_for_args (parent, MESSAGE_NO_ACTION, header, NULL);
+	e_alert_run_dialog_for_args (parent, MESSAGE_NO_ACTION, header, NULL);
 
 exit:
 	g_object_unref (action_data->reader);