From c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc Mon Sep 17 00:00:00 2001
From: Jonathon Jongsma <jonathon@quotidian.org>
Date: Mon, 30 Nov 2009 11:34:43 -0600
Subject: 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
---
 plugins/save-calendar/csv-format.c    | 2 --
 plugins/save-calendar/ical-format.c   | 1 -
 plugins/save-calendar/rdf-format.c    | 2 --
 plugins/save-calendar/save-calendar.c | 4 ++--
 4 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'plugins/save-calendar')

diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 7a4e856d68..63798106f1 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -34,8 +34,6 @@
 #include "calendar/common/authentication.h"
 #include <string.h>
 
-#include "e-util/e-error.h"
-
 #include "format-handler.h"
 
 typedef struct _CsvConfig CsvConfig;
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index 7888ecc4c1..0c5a18f252 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include "format-handler.h"
-#include "e-util/e-error.h"
 
 static void
 display_error_message (GtkWidget *parent, const gchar *message)
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 8734e17710..d28d2ef587 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -38,9 +38,7 @@
 #include <libxml/xpath.h>
 #include <string.h>
 
-#include "e-util/e-error.h"
 #include "calendar/common/authentication.c"
-
 #include "format-handler.h"
 
 static void
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index ab6afad801..2fbf0d7bbe 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -33,7 +33,7 @@
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <string.h>
 
 #include <shell/e-shell-sidebar.h>
@@ -239,7 +239,7 @@ open_for_writing (GtkWindow *parent, const gchar *uri, GError **error)
 	if (err && err->code == G_IO_ERROR_EXISTS) {
 		g_clear_error (&err);
 
-		if (e_error_run_dialog_for_args (parent, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, uri, NULL) == GTK_RESPONSE_OK) {
+		if (e_alert_run_dialog_for_args (parent, E_ALERT_ASK_FILE_EXISTS_OVERWRITE, uri, NULL) == GTK_RESPONSE_OK) {
 			fostream = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &err);
 
 			if (err && fostream) {
-- 
cgit