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

3 files changed, 18 insertions, 18 deletions

diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index f7ea281f78..31c069a088 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -21,7 +21,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 
 static void
 action_attach_cb (GtkAction *action,
@@ -78,7 +78,7 @@ action_close_cb (GtkAction *action,
 	if (subject == NULL || *subject == '\0')
 		subject = _("Untitled Message");
 
-	response = e_error_run_dialog_for_args (
+	response = e_alert_run_dialog_for_args (
 		GTK_WINDOW (composer),
 		"mail-composer:exit-unsaved",
 		subject, NULL);
@@ -162,16 +162,16 @@ action_save_cb (GtkAction *action,
 		if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
 			gint response;
 
-			response = e_error_run_dialog_for_args (
+			response = e_alert_run_dialog_for_args (
 				GTK_WINDOW (composer),
-				E_ERROR_ASK_FILE_EXISTS_OVERWRITE,
+				E_ALERT_ASK_FILE_EXISTS_OVERWRITE,
 				filename, NULL);
 			if (response != GTK_RESPONSE_OK)
 				return;
 		} else {
-			e_error_run_dialog_for_args (
+			e_alert_run_dialog_for_args (
 				GTK_WINDOW (composer),
-				E_ERROR_NO_SAVE_FILE, filename,
+				E_ALERT_NO_SAVE_FILE, filename,
 				g_strerror (errno_saved), NULL);
 			return;
 		}
@@ -179,9 +179,9 @@ action_save_cb (GtkAction *action,
 		close (fd);
 
 	if (!gtkhtml_editor_save (editor, filename, TRUE, &error)) {
-		e_error_run_dialog_for_args (
+		e_alert_run_dialog_for_args (
 			GTK_WINDOW (composer),
-			E_ERROR_NO_SAVE_FILE,
+			E_ALERT_NO_SAVE_FILE,
 			filename, error->message, NULL);
 		g_error_free (error);
 		return;
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index 5a9c95705b..638ca9b019 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -22,7 +22,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <e-util/e-util.h>
 #include <camel/camel-stream-fs.h>
 #include <camel/camel-stream-mem.h>
@@ -123,7 +123,7 @@ composer_autosave_finish_cb (EMsgComposer *composer,
 	e_composer_autosave_snapshot_finish (composer, result, &error);
 
 	if (error != NULL) {
-		e_error_run_dialog_for_args (
+		e_alert_run_dialog_for_args (
 			GTK_WINDOW (composer),
 			"mail-composer:no-autosave",
 			"", error->message, NULL);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 77a7014c47..07bec1ac13 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -47,7 +47,7 @@
 #include <gconf/gconf-client.h>
 
 #include "e-util/e-dialog-utils.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-util-private.h"
@@ -174,7 +174,7 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, c
 	va_list ap;
 	gint button;
 	GConfClient *gconf = gconf_client_get_default ();
-	EError *error = NULL;
+	EAlert *alert = NULL;
 
 	if (promptkey
 	    && !gconf_client_get_bool(gconf, promptkey, NULL)) {
@@ -183,11 +183,11 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, c
 	}
 
 	va_start(ap, arg0);
-	error = e_error_newv(tag, arg0, ap);
+	alert = e_alert_newv(tag, arg0, ap);
 	va_end(ap);
 
-	mbox = e_error_new_dialog (parent, error);
-	e_error_free (error);
+	mbox = e_alert_new_dialog (parent, alert);
+	e_alert_free (alert);
 
 	if (promptkey) {
 		check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
@@ -1085,7 +1085,7 @@ skip_content:
 	camel_object_unref (new);
 
 	if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) {
-		e_error_run_dialog_for_args ((GtkWindow *)composer, "mail-composer:no-build-message",
+		e_alert_run_dialog_for_args ((GtkWindow *)composer, "mail-composer:no-build-message",
 			    camel_exception_get_description (&ex), NULL);
 	}
 
@@ -1377,7 +1377,7 @@ autosave_load_draft_cb (EMsgComposer *composer,
 		g_unlink (filename);
 
 	else {
-		e_error_run_dialog_for_args (
+		e_alert_run_dialog_for_args (
 			GTK_WINDOW (composer),
 			"mail-composer:no-autosave",
 			(filename != NULL) ? filename : "",
@@ -4020,7 +4020,7 @@ e_msg_composer_check_autosave (GtkWindow *parent)
 	}
 
 	/* Ask if the user wants to recover the orphaned files. */
-	response = e_error_run_dialog_for_args (
+	response = e_alert_run_dialog_for_args (
 		parent, "mail-composer:recover-autosave", NULL);
 
 	/* Based on the user's response, recover or delete them. */