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

4 files changed, 17 insertions, 18 deletions

diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index e10d1094c6..44d2ff9604 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -1472,7 +1472,7 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content)
 	ERuleContext *context;
 	const gchar *user_filename;
 	gint response;
-	EError *error = NULL;
+	EAlert *alert = NULL;
 
 	g_return_if_fail (E_IS_SHELL_CONTENT (shell_content));
 
@@ -1517,10 +1517,10 @@ run:
 	if (response != GTK_RESPONSE_OK && response != GTK_RESPONSE_APPLY)
 		goto exit;
 
-	if (!e_filter_rule_validate (rule, &error)) {
-		e_error_run_dialog (GTK_WINDOW (dialog), error);
-		e_error_free (error);
-		error = NULL;
+	if (!e_filter_rule_validate (rule, &alert)) {
+		e_alert_run_dialog (GTK_WINDOW (dialog), alert);
+		e_alert_free (alert);
+		alert = NULL;
 		goto run;
 	}
 
@@ -1576,7 +1576,7 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content)
 	const gchar *user_filename;
 	gchar *search_name;
 	gint response;
-	EError *error = NULL;
+	EAlert *alert = NULL;
 
 	g_return_if_fail (E_IS_SHELL_CONTENT (shell_content));
 
@@ -1625,10 +1625,10 @@ run:
 	if (response != GTK_RESPONSE_OK)
 		goto exit;
 
-	if (!e_filter_rule_validate (rule, &error)) {
-		e_error_run_dialog (GTK_WINDOW (dialog), error);
-		e_error_free (error);
-		error = NULL;
+	if (!e_filter_rule_validate (rule, &alert)) {
+		e_alert_run_dialog (GTK_WINDOW (dialog), alert);
+		e_alert_free (alert);
+		alert = NULL;
 		goto run;
 	}
 
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 0c17c97fe8..e2aacc451e 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -28,7 +28,7 @@
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-util/e-bconf-map.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-util.h"
 
@@ -70,7 +70,7 @@ shell_migrate_attempt (EShell *shell,
 		if (error != NULL) {
 			gint response;
 
-			response = e_error_run_dialog_for_args (
+			response = e_alert_run_dialog_for_args (
 				e_shell_get_active_window (shell), "shell:upgrade-failed",
 				error->message, NULL);
 
@@ -242,7 +242,7 @@ e_shell_migrate_attempt (EShell *shell)
 			need = g_strdup_printf (_("%ld KB"), usage);
 			have = g_strdup_printf (_("%ld KB"), avail);
 
-			e_error_run_dialog_for_args (
+			e_alert_run_dialog_for_args (
 				e_shell_get_active_window (shell), "shell:upgrade-nospace",
 				need, have, NULL);
 
@@ -285,13 +285,13 @@ check_old:
 
 		string = g_strdup_printf (
 			"%d.%d.%d", last_major, last_minor, last_micro);
-		response = e_error_run_dialog_for_args (
+		response = e_alert_run_dialog_for_args (
 			e_shell_get_active_window (shell), "shell:upgrade-remove-1-4", string, NULL);
 		g_free (string);
 
 		switch (response) {
 			case GTK_RESPONSE_OK:  /* delete */
-				response = e_error_run_dialog_for_args (
+				response = e_alert_run_dialog_for_args (
 					e_shell_get_active_window (shell),
 					"shell:upgrade-remove-1-4-confirm",
 					NULL);
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 82970092c3..d961ebef55 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -23,7 +23,7 @@
 #include "e-preferences-window.h"
 
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <e-util/e-print.h>
 #include <gal-define-views-dialog.h>
 
@@ -752,7 +752,7 @@ action_forget_passwords_cb (GtkAction *action,
 {
 	gint response;
 
-	response = e_error_run_dialog_for_args (
+	response = e_alert_run_dialog_for_args (
 		GTK_WINDOW (shell_window), "shell:forget-passwords", NULL);
 
 	if (response == GTK_RESPONSE_OK)
diff --git a/shell/main.c b/shell/main.c
index c37ccc4d6c..7a09f60d12 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -54,7 +54,6 @@
 
 #include "e-util/e-bconf-map.h"
 #include "e-util/e-dialog-utils.h"
-#include "e-util/e-error.h"
 #include "e-util/e-plugin.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-profile-event.h"