aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c1
-rw-r--r--calendar/gui/dialogs/cancel-comp.c4
-rw-r--r--calendar/gui/dialogs/comp-editor.c6
-rw-r--r--calendar/gui/dialogs/delete-comp.c4
-rw-r--r--calendar/gui/dialogs/save-comp.c10
-rw-r--r--calendar/gui/dialogs/send-comp.c6
-rw-r--r--calendar/gui/e-calendar-view.c4
-rw-r--r--calendar/gui/gnome-cal.c12
-rw-r--r--calendar/importers/icalendar-importer.c4
9 files changed, 25 insertions, 26 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 25010a649d..f7160451bb 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -48,7 +48,6 @@
#include "alarm-notify.h"
#include "config-data.h"
#include "util.h"
-#include "e-util/e-error.h"
#define d(x)
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 69331f03a1..81ac2b6f82 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "cancel-comp.h"
@@ -105,7 +105,7 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g
return FALSE;
}
- if (e_error_run_dialog_for_args (parent, id, NULL) == GTK_RESPONSE_YES)
+ if (e_alert_run_dialog_for_args (parent, id, NULL) == GTK_RESPONSE_YES)
return TRUE;
else
return FALSE;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 85f2304d8a..07d68806a5 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -65,7 +65,7 @@
#include "widgets/misc/e-attachment-view.h"
#include "widgets/misc/e-attachment-paned.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#define COMP_EDITOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -833,7 +833,7 @@ action_save_cb (GtkAction *action,
}
if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
- e_error_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+ e_alert_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
return;
}
@@ -1833,7 +1833,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send)
switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
case GTK_RESPONSE_YES: /* Save */
if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
- e_error_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+ e_alert_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
/* don't discard changes when selected readonly calendar */
return FALSE;
}
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index c205f3bd8d..d5f5929e6a 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -27,7 +27,7 @@
#endif
#include <glib/gi18n.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "../calendar-config.h"
#include "delete-comp.h"
@@ -159,7 +159,7 @@ delete_component_dialog (ECalComponent *comp,
arg0 = g_strdup_printf ("%d", n_comps);
}
- response = e_error_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL);
+ response = e_alert_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL);
g_free (arg0);
return response == GTK_RESPONSE_YES;
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 91f55a0ca7..dc698b4596 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -25,7 +25,7 @@
#include <config.h>
#endif
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "save-comp.h"
#include "comp-editor.h"
@@ -50,13 +50,13 @@ save_component_dialog (GtkWindow *parent, ECalComponent *comp)
case E_CAL_COMPONENT_EVENT:
flags = comp_editor_get_flags (COMP_EDITOR(parent));
if (flags & COMP_EDITOR_MEETING)
- return e_error_run_dialog_for_args (parent, "calendar:prompt-save-meeting", NULL);
+ return e_alert_run_dialog_for_args (parent, "calendar:prompt-save-meeting", NULL);
else
- return e_error_run_dialog_for_args (parent, "calendar:prompt-save-appointment", NULL);
+ return e_alert_run_dialog_for_args (parent, "calendar:prompt-save-appointment", NULL);
case E_CAL_COMPONENT_TODO:
- return e_error_run_dialog_for_args (parent, "calendar:prompt-save-task", NULL);
+ return e_alert_run_dialog_for_args (parent, "calendar:prompt-save-task", NULL);
case E_CAL_COMPONENT_JOURNAL:
- return e_error_run_dialog_for_args (parent, "calendar:prompt-save-memo", NULL);
+ return e_alert_run_dialog_for_args (parent, "calendar:prompt-save-memo", NULL);
default:
return GTK_RESPONSE_NO;
}
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 13f016982e..1d663478c8 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -27,7 +27,7 @@
#endif
#include <glib/gi18n-lib.h>
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
#include "send-comp.h"
@@ -154,7 +154,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo
strip_alarms = NULL;
}
- dialog = e_error_new_dialog_for_args (parent, id, NULL);
+ dialog = e_alert_new_dialog_for_args (parent, id, NULL);
if (strip_alarms)
sa_checkbox = add_checkbox (GTK_BOX (GTK_DIALOG (dialog)->vbox), _("Send my alarms with this event"));
@@ -199,7 +199,7 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c
return FALSE;
}
- if (e_error_run_dialog_for_args (parent, id, NULL) == GTK_RESPONSE_YES)
+ if (e_alert_run_dialog_for_args (parent, id, NULL) == GTK_RESPONSE_YES)
return TRUE;
else
return FALSE;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 885cd66a90..840c5526c6 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -32,7 +32,7 @@
#include <gdk/gdkkeysyms.h>
#include <libedataserver/e-time-utils.h>
#include <e-util/e-util.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
#include <e-util/e-selection.h>
#include <e-util/e-datetime-format.h>
#include <e-util/e-dialog-utils.h>
@@ -1202,7 +1202,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
if (e_cal_is_read_only (default_client, &readonly, NULL) && readonly) {
GtkWidget *widget;
- widget = e_error_new_dialog_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL);
+ widget = e_alert_new_dialog_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL);
g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy),
widget);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 1d6629aa61..22791b31c3 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -46,7 +46,7 @@
#include <widgets/menus/gal-define-views-dialog.h>
#include "e-util/e-binding.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 "shell/e-shell.h"
#include "dialogs/delete-error.h"
@@ -1900,7 +1900,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
return;
}
- w = e_error_new_dialog_for_args (parent, "calendar:server-version", NULL);
+ w = e_alert_new_dialog_for_args (parent, "calendar:server-version", NULL);
/*e_calendar_utils_show_error_silent (w); KILL-BONOBO */
g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id);
@@ -1922,7 +1922,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
return;
}
- w = e_error_new_dialog_for_args (parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL);
+ w = e_alert_new_dialog_for_args (parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL);
/*e_calendar_utils_show_error_silent (w); KILL-BONOBO */
g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id);
@@ -1987,7 +1987,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
e_cal_open_async (ecal, FALSE);
return;
case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
- e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:server-version", NULL);
+ e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:server-version", NULL);
default:
/* Make sure the source doesn't disappear on us */
g_object_ref (source);
@@ -2067,7 +2067,7 @@ backend_error_cb (ECal *client, const gchar *message, gpointer data)
return;
}
- dialog = (GtkDialog *)e_error_new(parent, "calendar:error-on-loading-the-calendar", uristr, message, NULL);
+ dialog = (GtkDialog *)e_alert_new(parent, "calendar:error-on-loading-the-calendar", uristr, message, NULL);
/* e_calendar_utils_show_error_silent(GTK_WIDGET (dialog)); KILL-BONOBO */
g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog));
@@ -2114,7 +2114,7 @@ backend_died_cb (ECal *ecal, gpointer data)
return;
}
- w = e_error_new_dialog_for_args (parent, "calendar:backend_died", NULL);
+ w = e_alert_new_dialog_for_args (parent, "calendar:backend_died", NULL);
/* e_calendar_utils_show_error_silent (w); KILL-BONOBO */
g_hash_table_insert (non_intrusive_error_table, (gpointer) id, g_object_ref(w));
g_signal_connect((GtkObject *)w, "destroy", G_CALLBACK(non_intrusive_error_remove), (gpointer) id);
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 6a09c36e03..b7b2b515ad 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -284,13 +284,13 @@ ivcal_import_items(gpointer d)
case E_CAL_SOURCE_TYPE_EVENT:
prepare_events (ici->icalcomp, NULL);
if (!update_objects (ici->client, ici->icalcomp)) {
- /* FIXME: e_error ... */;
+ /* FIXME: e_alert ... */;
}
break;
case E_CAL_SOURCE_TYPE_TODO:
prepare_tasks (ici->icalcomp, NULL);
if (!update_objects (ici->client, ici->icalcomp)) {
- /* FIXME: e_error ... */;
+ /* FIXME: e_alert ... */;
}
break;
default:
generated by cgit (git 2.34.1) at 2024-11-17 09:07:44 +0800