From 31204c9cc21ec32c8006124cf18763161daa99d2 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Mon, 7 Dec 2009 10:19:37 -0600 Subject: Port all error code to use GObject-ified EAlert / EAlertDialog The changes are mainly including the e-alert-header.h header instead of just e-alert.h. This allows us to include e-alert.h in non-UI situations when necessary. --- calendar/gui/dialogs/cancel-comp.c | 2 +- calendar/gui/dialogs/comp-editor.c | 2 +- calendar/gui/dialogs/delete-comp.c | 2 +- calendar/gui/dialogs/save-comp.c | 2 +- calendar/gui/dialogs/send-comp.c | 4 ++-- calendar/gui/e-calendar-view.c | 4 ++-- calendar/gui/gnome-cal.c | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 81ac2b6f82..2c827afacf 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -28,7 +28,7 @@ #include #include -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "cancel-comp.h" diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 07d68806a5..18bd574728 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-alert.h" +#include "e-util/e-alert-dialog.h" #define COMP_EDITOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index d5f5929e6a..e0a431ffb7 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -27,7 +27,7 @@ #endif #include -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "../calendar-config.h" #include "delete-comp.h" diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index dc698b4596..823bd4be52 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -25,7 +25,7 @@ #include #endif -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "save-comp.h" #include "comp-editor.h" diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 1d663478c8..a42501c9d6 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -27,7 +27,7 @@ #endif #include -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.h" #include "send-comp.h" @@ -154,7 +154,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo strip_alarms = NULL; } - dialog = e_alert_new_dialog_for_args (parent, id, NULL); + dialog = e_alert_dialog_new_for_args (parent, id, NULL); if (strip_alarms) sa_checkbox = add_checkbox (GTK_BOX (GTK_DIALOG (dialog)->vbox), _("Send my alarms with this event")); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 840c5526c6..f23088af83 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -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_alert_new_dialog_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL); + widget = e_alert_dialog_new_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 22791b31c3..f4f15d2482 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -46,7 +46,7 @@ #include #include "e-util/e-binding.h" #include "e-util/e-util.h" -#include "e-util/e-alert.h" +#include "e-util/e-alert-dialog.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_alert_new_dialog_for_args (parent, "calendar:server-version", NULL); + w = e_alert_dialog_new_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_alert_new_dialog_for_args (parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL); + w = e_alert_dialog_new_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); @@ -2114,7 +2114,7 @@ backend_died_cb (ECal *ecal, gpointer data) return; } - w = e_alert_new_dialog_for_args (parent, "calendar:backend_died", NULL); + w = e_alert_dialog_new_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); -- cgit v1.2.3