8 files changed, 12 insertions, 13 deletions
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 2cde45083f..a1946c6f68 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -25,7 +25,7 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-stream-mem.h>
 
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "mail/em-composer-utils.h"
 #include "mail/mail-tools.h"
 
@@ -358,7 +358,7 @@ exit:
 		else
 			folder_name = g_strdup (data);
 
-		e_error_run_dialog_for_args (
+		e_alert_run_dialog_for_args (
 			parent, "mail-composer:attach-nomessages",
 			folder_name, camel_exception_get_description (&ex),
 			NULL);
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index 6089ffc570..47637eb1d4 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <camel/camel-junk-plugin.h>
 
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "shell/e-shell.h"
 
 #include "mail/em-junk.h"
@@ -52,7 +52,7 @@ mail_junk_hook_idle_cb (struct ErrorData *data)
 {
 	GtkWidget *widget;
 
-	widget = e_error_new_dialog_for_args (e_shell_get_active_window (NULL),
+	widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL),
 		data->error_message, data->error->message, NULL);
 	em_utils_show_error_silent (widget);
 
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index c19ab0d336..8dd3caf643 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -29,7 +29,7 @@
 
 #include "e-util/e-account-utils.h"
 #include "e-util/e-binding.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 #include "e-util/e-import.h"
 #include "e-util/e-util.h"
 #include "shell/e-shell.h"
@@ -673,7 +673,7 @@ mail_shell_backend_quit_requested_cb (EShell *shell,
 	if (unsent == 0)
 		return;
 
-	response = e_error_run_dialog_for_args (e_shell_get_active_window (shell), "mail:exit-unsaved", NULL);
+	response = e_alert_run_dialog_for_args (e_shell_get_active_window (shell), "mail:exit-unsaved", NULL);
 
 	if (response == GTK_RESPONSE_YES)
 		return;
diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index 2e39c18a62..7231cc8061 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
@@ -58,7 +58,7 @@
 
 #include "e-util/e-account-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-util-private.h"
 #include "e-util/e-plugin.h"
 #include "e-util/e-signature-utils.h"
@@ -1598,7 +1598,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
 			if (errno == EEXIST) {
 				gint save = errno;
 
-				switch (e_error_run_dialog_for_args (e_shell_get_active_window (NULL), "mail:ask-migrate-existing", src->str, dest->str, NULL)) {
+				switch (e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "mail:ask-migrate-existing", src->str, dest->str, NULL)) {
 				case GTK_RESPONSE_ACCEPT:
 					mode = CP_OVERWRITE;
 					goto retry_copy;
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 895bd33903..c18b3e68b0 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -20,6 +20,7 @@
  */
 
 #include "e-mail-shell-view-private.h"
+#include "filter/e-filter-input.h"
 
 static gpointer parent_class;
 static GType mail_shell_view_type;
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index d0cc34f608..81ce907e18 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -34,7 +34,7 @@
 
 #include <glib/gi18n.h>
 
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 
 #include "e-mail-store.h"
 #include "em-config.h"
@@ -82,7 +82,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view)
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (tree_view));
 	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
 
-	response = e_error_run_dialog_for_args (
+	response = e_alert_run_dialog_for_args (
 		parent, "mail:ask-delete-proxy-accounts", NULL);
 
 	if (response != GTK_RESPONSE_YES) {
@@ -201,7 +201,7 @@ account_prefs_delete_account (EAccountManager *manager)
 	has_proxies =
 		e_account_list_account_has_proxies (account_list, account);
 
-	response = e_error_run_dialog_for_args (
+	response = e_alert_run_dialog_for_args (
 		parent, has_proxies ?
 		"mail:ask-delete-account-with-proxies" :
 		"mail:ask-delete-account", NULL);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 57ce4dd4c8..ba7e2296c9 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -48,7 +48,6 @@
 #include <editor/gtkhtml-spell-language.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 #include "widgets/misc/e-charset-combo-box.h"
 #include "widgets/misc/e-signature-editor.h"
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index baed9ca948..6b419d0c2e 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -38,7 +38,6 @@
 #include <glib/gstdio.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 
 #include "mail-config.h"