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, 21 insertions, 22 deletions

diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c
index 27bd49e36c..db3bcac4f7 100644
--- a/plugins/groupwise-features/camel-gw-listener.c
+++ b/plugins/groupwise-features/camel-gw-listener.c
@@ -29,7 +29,7 @@
 #include  <camel/camel-i18n.h>
 #include <e-gw-connection.h>
 #include <libedataserverui/e-passwords.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include <libedataserver/e-account.h>
 #include <libecal/e-cal.h>
 #include <shell/e-shell.h>
@@ -542,7 +542,7 @@ get_addressbook_names_from_server (gchar *source_url)
 
 	/*FIXME: This error message should be relocated to addressbook and should reflect
 	 * that it actually failed to get the addressbooks*/
-	e_error_run_dialog_for_args (e_shell_get_active_window (NULL),
+	e_alert_run_dialog_for_args (e_shell_get_active_window (NULL),
 				     "mail:gw-accountsetup-error", poa_address,
 				     NULL);
 	return NULL;
@@ -656,7 +656,7 @@ add_addressbook_sources (EAccount *account)
 
 	if (!is_frequent_contacts) {
 		/* display warning message */
-		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:gw-book-list-init", NULL);
 	}
 	return TRUE;
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index ac985fd213..23f4a0833f 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
-#include <e-util/e-error.h>
 #include <e-util/e-util-private.h>
 #include <e-gw-connection.h>
 #define ROOTNODE "vboxSettings"
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index cffc371454..70b79d7c80 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -29,7 +29,7 @@
 #include <camel/camel-store.h>
 #include <camel/camel-folder.h>
 
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 
 #include <mail/e-mail-reader.h>
 
@@ -100,7 +100,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
 		if (n == GTK_RESPONSE_YES) {
 
 			if (e_gw_connection_retract_request (cnc, id, NULL, FALSE, FALSE) != E_GW_CONNECTION_STATUS_OK )
-				e_error_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
+				e_alert_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
 							     "org.gnome.evolution.message.retract:retract-failure",
 							     NULL);
 			else {
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 611213bd42..5f12a9a0e5 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <libecal/e-cal.h>
 
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <shell/e-shell-view.h>
 
 #include <calendar/gui/e-calendar-view.h>
@@ -176,7 +176,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 			else
 				msg = "org.gnome.evolution.process_meeting:recurrence-decline";
 
-			response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)cal_view)),
+			response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)cal_view)),
 								msg, NULL);
 			if (response == GTK_RESPONSE_YES) {
 				icalproperty *prop;
@@ -347,7 +347,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 
 	gtk_widget_hide (GTK_WIDGET (ce));
 
-	response = e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)ce)),
+	response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)ce)),
 						"org.gnome.evolution.process_meeting:resend-retract",
 						NULL);
 	if (response == GTK_RESPONSE_NO) {
@@ -392,7 +392,7 @@ gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view)
 		else
 			msg = "org.gnome.evolution.process_meeting:resend";
 
-		response = e_error_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
+		response = e_alert_run_dialog_for_args (GTK_WINDOW (e_shell_view_get_shell_window (shell_view)),
 							msg, NULL);
 		if (response == GTK_RESPONSE_YES) {
 			mod = CALOBJ_MOD_ALL;
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 684dcd6d38..b885b1445b 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -38,7 +38,7 @@
 #include <mail/mail-ops.h>
 #include <libedataserver/e-account.h>
 #include <e-util/e-util.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-account-utils.h>
@@ -320,7 +320,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 	if (email[i]=='@')
 		name = g_strndup(email, i);
 	else {
-		e_error_run_dialog_for_args (error_parent,
+		e_alert_run_dialog_for_args (error_parent,
 					     "org.gnome.evolution.proxy-login:invalid-user",
 					     email, NULL);
 		return;
@@ -330,7 +330,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 	   If so, it is violating the (li)unix philosophy of User creation. So dont care about that scenario*/
 
 	if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) {
-		e_error_run_dialog_for_args (error_parent,
+		e_alert_run_dialog_for_args (error_parent,
 					     "org.gnome.evolution.proxy-login:already-loggedin",
 					     email, NULL);
 		g_free (name);
@@ -367,7 +367,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 		g_free (parent_source_url);
 		camel_url_free (parent);
 	} else {
-		e_error_run_dialog_for_args (error_parent,
+		e_alert_run_dialog_for_args (error_parent,
 					     "org.gnome.evolution.proxy-login:invalid-user",
 					     email, NULL);
 		return;
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index bac1f9ba80..a6c1b58f90 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -31,7 +31,7 @@
 #include <libedataserverui/e-contact-store.h>
 
 #include <e-util/e-util.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <e-util/e-util-private.h>
 #include <e-gw-container.h>
 #include <e-gw-connection.h>
@@ -330,7 +330,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 				tmp = destinations;
 
 				if (!tmp) {
-					e_error_run_dialog_for_args (parent,
+					e_alert_run_dialog_for_args (parent,
 								     "org.gnome.evolution.proxy:no-user",
 								     NULL, NULL);
 					return -1;
@@ -344,13 +344,13 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 						continue;
 
 					if (g_strrstr (email, "@") == NULL) {
-						e_error_run_dialog_for_args (parent,
+						e_alert_run_dialog_for_args (parent,
 									     "org.gnome.evolution.proxy:invalid-user",
 									     email, NULL);
 						return -1;
 					}
 					if (! g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) {
-						e_error_run_dialog_for_args (parent,
+						e_alert_run_dialog_for_args (parent,
 									     "org.gnome.evolution.proxy:invalid-user",
 									     email, NULL);
 						return -1;
@@ -371,7 +371,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 								return 0;
 							}
 
-							e_error_run_dialog_for_args (parent,
+							e_alert_run_dialog_for_args (parent,
 										     "org.gnome.evolution.proxy:user-is-proxy",
 										     email, NULL);
 							return -1;
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index c7850c50e7..d417f4ce77 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n-lib.h>
 #include <libedataserverui/e-contact-store.h>
 #include <e-util/e-util.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <e-util/e-util-private.h>
 #include <e-gw-container.h>
 #include <e-gw-connection.h>
@@ -339,12 +339,12 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 		email = e_destination_get_email (tmp->data);
 		/* You can't share a folder with yourself*/
 		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email)))
-			e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
+			e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
 						     "org.gnome.evolution.mail_shared_folder:invalid-user",
 						     email, NULL);
 		else {
 			if (!g_ascii_strcasecmp (email, "" )) {
-				e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
+				e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button))),
 							     "org.gnome.evolution.mail_shared_folder:no-user", NULL);
 
 				return;