aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/save-calendar
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-12-01 01:34:43 +0800
committerJonathon Jongsma <jonathon@quotidian.org>2009-12-01 03:33:04 +0800
commitc2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc (patch)
treee6430bf480afc3e4a220fdf713413c8df4a9da41 /plugins/save-calendar
parent495e9bf8001e2209a35e8991c07ec038576efdd4 (diff)
downloadgsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.gz
gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.tar.zst
gsoc2013-evolution-c2ee0afbc85ce3ddf38ec07497c0cdae4f42a7fc.zip
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
Diffstat (limited to 'plugins/save-calendar')
-rw-r--r--plugins/save-calendar/csv-format.c2
-rw-r--r--plugins/save-calendar/ical-format.c1
-rw-r--r--plugins/save-calendar/rdf-format.c2
-rw-r--r--plugins/save-calendar/save-calendar.c4
4 files changed, 2 insertions, 7 deletions
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) {