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

7 files changed, 22 insertions, 22 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 2973730788..501af7d97e 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -43,7 +43,7 @@
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-util.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "misc/e-dateedit.h"
 #include "misc/e-image-chooser.h"
 #include "misc/e-url-entry.h"
@@ -2345,7 +2345,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
 					if ((height > 96 || width > 96)) {
 
 						prompt_response =
-							e_error_run_dialog_for_args
+							e_alert_run_dialog_for_args
 							(GTK_WINDOW (editor->app),
 							 "addressbook:prompt-resize",
 							 NULL);
@@ -2773,7 +2773,7 @@ categories_clicked (GtkWidget *button, EContactEditor *editor)
 		g_free (categories);
 		return;
 	}else if (!(dialog = GTK_DIALOG (e_categories_dialog_new (categories)))) {
-		e_error_run_dialog_for_args (GTK_WINDOW (editor->app),
+		e_alert_run_dialog_for_args (GTK_WINDOW (editor->app),
 					     "addressbook:edit-categories",
 					     NULL);
 		g_free (categories);
@@ -3061,7 +3061,7 @@ save_contact (EContactEditor *ce, gboolean should_close)
 		return;
 
 	if (ce->target_editable && !e_book_is_writable (ce->source_book)) {
-		if (e_error_run_dialog_for_args (GTK_WINDOW (ce->app),
+		if (e_alert_run_dialog_for_args (GTK_WINDOW (ce->app),
 						 "addressbook:prompt-move",
 						 NULL) == GTK_RESPONSE_NO)
 			return;
@@ -3209,7 +3209,7 @@ e_contact_editor_is_valid (EABEditor *editor)
 
 	if (validation_error) {
 		g_string_append (errmsg, ".");
-		e_error_run_dialog_for_args (GTK_WINDOW (ce->app),
+		e_alert_run_dialog_for_args (GTK_WINDOW (ce->app),
 					     "addressbook:generic-error",
 					     _("Invalid contact."), errmsg->str,
 					     NULL);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index ced2f2ec12..bc750d15ef 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -33,7 +33,7 @@
 #include "e-contact-editor.h"
 #include "e-contact-quick-add.h"
 #include "eab-contact-merging.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 
 typedef struct _QuickAdd QuickAdd;
 struct _QuickAdd {
@@ -129,7 +129,7 @@ merge_cb (EBook *book, EBookStatus status, gpointer closure)
 		if (e_book_is_writable (book))
 			eab_merging_book_add_contact (book, qa->contact, NULL, NULL);
 		else
-			e_error_run_dialog_for_args (e_shell_get_active_window (NULL),
+			e_alert_run_dialog_for_args (e_shell_get_active_window (NULL),
 						     "addressbook:error-read-only",
 						     e_source_peek_name (e_book_get_source (book)),
 						     NULL);
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index dff1b3da83..7eb07007da 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -24,7 +24,7 @@
 
 #include "e-contact-list-editor.h"
 #include <e-util/e-util-private.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include "shell/e-shell.h"
 
 #include <string.h>
@@ -262,7 +262,7 @@ contact_list_editor_contact_exists (EContactListModel *model,
 	if (!e_contact_list_model_has_email (model, email))
 		return FALSE;
 
-	return (e_error_run_dialog_for_args (e_shell_get_active_window (NULL),
+	return (e_alert_run_dialog_for_args (e_shell_get_active_window (NULL),
 					     tag, email, NULL) != GTK_RESPONSE_YES);
 }
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index 87fd8e8fec..5359d8d607 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "e-contact-list-model.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "shell/e-shell.h"
 
 static gpointer parent_class;
@@ -153,7 +153,7 @@ e_contact_list_model_add_email (EContactListModel *model,
 	g_return_if_fail (email != NULL);
 
 	if (e_contact_list_model_has_email (model, email))
-		if (e_error_run_dialog_for_args (e_shell_get_active_window
+		if (e_alert_run_dialog_for_args (e_shell_get_active_window
 						 (NULL), tag, email, NULL) != GTK_RESPONSE_YES)
 			return;
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 3e10722c00..cb64e36272 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -52,7 +52,7 @@
 #include "e-addressbook-table-adapter.h"
 #include "eab-contact-merging.h"
 
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "e-util/e-util-private.h"
 
 #include <gdk/gdkkeysyms.h>
@@ -894,7 +894,7 @@ backend_died (EAddressbookView *view)
 	model = e_addressbook_view_get_model (view);
 	book = e_addressbook_model_get_book (model);
 
-	e_error_run_dialog_for_args (
+	e_alert_run_dialog_for_args (
 		GTK_WINDOW (shell_window),
 		"addressbook:backend-died",
 		e_book_get_uri (book), NULL);
@@ -1013,7 +1013,7 @@ delete_contacts_cb (EBook *book,  EBookStatus status,  gpointer closure)
 		case E_BOOK_ERROR_CANCELLED :
 			break;
 		case E_BOOK_ERROR_PERMISSION_DENIED :
-			e_error_run_dialog_for_args (e_shell_get_active_window (NULL),
+			e_alert_run_dialog_for_args (e_shell_get_active_window (NULL),
 						     "addressbook:contact-delete-error-perm",
 						     NULL);
 			break;
@@ -1217,7 +1217,7 @@ e_addressbook_view_view (EAddressbookView *view)
 	if (length > 5) {
 		GtkWidget *dialog;
 
-		/* XXX Use e_error_new(). */
+		/* XXX Use e_alert_new(). */
 		/* XXX Provide a parent window. */
 		dialog = gtk_message_dialog_new (
 			NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index e80e65575f..efc97e682e 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -35,7 +35,7 @@
 #include "eab-gui-util.h"
 #include "util/eab-book-util.h"
 #include <libebook/e-destination.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "e-util/e-html-utils.h"
 #include "shell/e-shell.h"
 #include "misc/e-image-chooser.h"
@@ -86,7 +86,7 @@ eab_error_dialog (const gchar *msg, EBookStatus status)
 		status_str = status_to_string [status];
 
 	if (status_str)
-		e_error_run_dialog_for_args (e_shell_get_active_window (NULL),
+		e_alert_run_dialog_for_args (e_shell_get_active_window (NULL),
 					     "addressbook:generic-error",
 					     msg, _(status_str), NULL);
 }
@@ -147,7 +147,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 		}
 	}
 
-	dialog  = e_error_new_dialog_for_args ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL);
+	dialog  = e_alert_new_dialog_for_args ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL);
 	g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
 
 	gtk_widget_show (dialog);
@@ -189,13 +189,13 @@ eab_search_result_dialog      (GtkWidget *parent,
 		g_return_if_reached ();
 	}
 
-	e_error_run_dialog_for_args ((GtkWindow *) parent, "addressbook:search-error", str, NULL);
+	e_alert_run_dialog_for_args ((GtkWindow *) parent, "addressbook:search-error", str, NULL);
 }
 
 gint
 eab_prompt_save_dialog (GtkWindow *parent)
 {
-	return e_error_run_dialog_for_args (parent, "addressbook:prompt-save", NULL);
+	return e_alert_run_dialog_for_args (parent, "addressbook:prompt-save", NULL);
 }
 
 static gchar *
diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c
index 6e70e5f3f3..7fe470a4f3 100644
--- a/addressbook/util/addressbook.c
+++ b/addressbook/util/addressbook.c
@@ -30,7 +30,7 @@
 #include <libedataserver/e-url.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "shell/e-shell.h"
 #include "addressbook.h"
 
@@ -108,7 +108,7 @@ load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure)
 				goto done;
 			}
 		} else if (status == E_BOOK_ERROR_INVALID_SERVER_VERSION) {
-			e_error_run_dialog_for_args (e_shell_get_active_window (NULL),
+			e_alert_run_dialog_for_args (e_shell_get_active_window (NULL),
 						     "addressbook:server-version",
 						     NULL);
 			status = E_BOOK_ERROR_OK;