diff options
| -rw-r--r-- | calendar/ChangeLog | 16 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 13 | ||||
| -rw-r--r-- | calendar/gui/dialogs/meeting-page.c | 7 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 2 | ||||
| -rw-r--r-- | calendar/gui/tasks-control.c | 15 |
5 files changed, 38 insertions, 15 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4d767bf9ec..54293f05ab 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,21 @@ 2003-03-25 Dan Winship <danw@ximian.com> + * gui/itip-utils.c: Update for e_notice move + + * gui/tasks-control.c (confirm_expunge): Move the code that used + to be e_gnome_dialog_set_parent here, since it was marked + deprecated and this was the only place using it. + + * gui/dialogs/comp-editor.c: Update for e_notice move + (page_changed_cb, page_summary_changed_cb, page_dates_changed_cb): + Pass a parent_window to e_notice. + + * gui/dialogs/meeting-page.c: Update for e_notice move. + (meeting_page_fill_component, meeting_page_fill_component, + popup_delegate_cb): Pass a parent_window to e_notice + +2003-03-25 Dan Winship <danw@ximian.com> + * cal-util/cal-util.c (cal_util_parse_ics_file): Utility wrapper around icalparser. diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 27dd2ea8c2..c8d89eae7e 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -38,7 +38,6 @@ #include <bonobo/bonobo-ui-container.h> #include <bonobo/bonobo-ui-util.h> #include <gal/widgets/e-unicode.h> -#include <gal/widgets/e-gui-utils.h> #include <e-util/e-dialog-utils.h> #include <evolution-shell-component-utils.h> #include "../print.h" @@ -650,11 +649,11 @@ comp_editor_append_page (CompEditor *editor, gtk_notebook_append_page (priv->notebook, page_widget, label_widget); /* Listen for things happening on the page */ - g_signal_connect((page), "changed", + g_signal_connect(page, "changed", G_CALLBACK (page_changed_cb), editor); - g_signal_connect((page), "summary_changed", + g_signal_connect(page, "summary_changed", G_CALLBACK (page_summary_changed_cb), editor); - g_signal_connect((page), "dates_changed", + g_signal_connect(page, "dates_changed", G_CALLBACK (page_dates_changed_cb), editor); /* Listen for when the page is mapped/unmapped so we can @@ -1328,7 +1327,7 @@ page_changed_cb (GtkObject *obj, gpointer data) priv->changed = TRUE; if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (NULL, GTK_MESSAGE_INFO, + e_notice (editor, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } @@ -1352,7 +1351,7 @@ page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data) priv->changed = TRUE; if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (NULL, GTK_MESSAGE_INFO, + e_notice (editor, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } @@ -1376,7 +1375,7 @@ page_dates_changed_cb (GtkObject *obj, priv->changed = TRUE; if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (NULL, GTK_MESSAGE_INFO, + e_notice (editor, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index 483d77b790..860da2840f 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -42,6 +42,7 @@ #include <gal/widgets/e-popup-menu.h> #include <gal/widgets/e-gui-utils.h> #include <widgets/misc/e-dateedit.h> +#include <e-util/e-dialog-utils.h> #include <e-util/e-dialog-widgets.h> #include "../calendar-component.h" @@ -396,7 +397,7 @@ meeting_page_fill_component (CompEditorPage *page, CalComponent *comp) /* Sanity Check */ if (addr == NULL || strlen (addr) == 0) { - e_notice (NULL, GTK_MESSAGE_ERROR, + e_notice (page, GTK_MESSAGE_ERROR, _("An organizer is required.")); g_free (addr); g_free (cn); @@ -420,7 +421,7 @@ meeting_page_fill_component (CompEditorPage *page, CalComponent *comp) } if (e_meeting_model_count_actual_attendees (priv->model) < 1) { - e_notice (NULL, GTK_MESSAGE_ERROR, + e_notice (page, GTK_MESSAGE_ERROR, _("At least one attendee is required.")); return FALSE; } @@ -575,7 +576,7 @@ popup_delegate_cb (GtkWidget *widget, gpointer data) /* Make sure we can add the new delegatee person */ if (e_meeting_model_find_attendee (priv->model, address, NULL) != NULL) { - e_notice (NULL, GTK_MESSAGE_ERROR, + e_notice (mpage, GTK_MESSAGE_ERROR, _("That person is already attending the meeting!")); goto cleanup; } diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 37a4e383fa..831e76a2a9 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -29,11 +29,11 @@ #include <bonobo/bonobo-moniker-util.h> #include <libgnome/gnome-i18n.h> #include <gtk/gtkwidget.h> -#include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> #include <gal/util/e-util.h> #include <ical.h> #include <Evolution-Composer.h> +#include <e-util/e-dialog-utils.h> #include <e-util/e-time-utils.h> #include <cal-util/timeutil.h> #include <cal-util/cal-util.h> diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 31d1e2b984..41ff698fce 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -445,10 +445,16 @@ tasks_control_complete_cmd (BonoboUIComponent *uic, e_tasks_complete_selected (tasks); } +static void +parent_destroyed (GnomeDialog *dialog, GObject *deadbeef) +{ + gnome_dialog_close (GNOME_DIALOG (dialog)); +} + static gboolean confirm_expunge (ETasks *tasks) { - GtkWidget *dialog, *label, *checkbox; + GtkWidget *dialog, *label, *checkbox, *parent; int button; if (!calendar_config_get_confirm_expunge ()) @@ -458,9 +464,10 @@ confirm_expunge (ETasks *tasks) GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO, NULL); - e_gnome_dialog_set_parent (GNOME_DIALOG (dialog), - GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (tasks), - GTK_TYPE_WINDOW))); + + parent = gtk_widget_get_toplevel (GTK_WIDGET (tasks)); + gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (parent)); + g_object_weak_ref ((GObject *) parent, (GWeakNotify) parent_destroyed, dialog); label = gtk_label_new (_("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?")); |