diff options
-rw-r--r-- | calendar/ChangeLog | 11 | ||||
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 6 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 6 | ||||
-rw-r--r-- | calendar/gui/dialogs/memo-page.c | 4 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-page.c | 6 |
5 files changed, 22 insertions, 11 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 1597a9f7a3..79be754b62 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2007-11-16 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #492793 + + * gui/dialogs/task-page.c: (task_page_fill_component): + * gui/dialogs/comp-editor.c: (page_changed_cb), + (page_summary_changed_cb), (page_dates_changed_cb): + * gui/dialogs/event-page.c: (event_page_fill_component): + * gui/dialogs/memo-page.c: (memo_page_fill_component): + Pass real widget as parent to e_notice, not a GObject. + 2007-11-13 Ondrej Jirman <megous@megous.com> ** Fix for bug #494323 diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 2b2b797775..ce2ae3b69a 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2905,7 +2905,7 @@ page_changed_cb (GtkObject *obj, gpointer data) comp_editor_set_changed (editor, TRUE); if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (editor, GTK_MESSAGE_INFO, + e_notice (priv->notebook, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } @@ -2959,7 +2959,7 @@ page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data) comp_editor_page_set_summary (l->data, summary); if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (editor, GTK_MESSAGE_INFO, + e_notice (priv->notebook, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } @@ -2983,7 +2983,7 @@ page_dates_changed_cb (GtkObject *obj, comp_editor_page_set_dates (l->data, dates); if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (editor, GTK_MESSAGE_INFO, + e_notice (priv->notebook, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index a60b87c4c9..7e5e2b8dda 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1503,13 +1503,13 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) /* Sanity Check */ if (a == NULL) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("The organizer selected no longer has an account.")); return FALSE; } if (a->id->address == NULL || strlen (a->id->address) == 0) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("An organizer is required.")); return FALSE; } @@ -1534,7 +1534,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) } if (e_meeting_store_count_actual_attendees (priv->model) < 1) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("At least one attendee is required.")); return FALSE; } diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index d89e7a4049..4696e82428 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -738,13 +738,13 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) /* Sanity Check */ if (a == NULL) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("The organizer selected no longer has an account.")); return FALSE; } if (a->id->address == NULL || strlen (a->id->address) == 0) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("An organizer is required.")); return FALSE; } diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index c929d32ea3..273e2597c0 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -939,13 +939,13 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) /* Sanity Check */ if (a == NULL) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("The organizer selected no longer has an account.")); return FALSE; } if (a->id->address == NULL || strlen (a->id->address) == 0) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("An organizer is required.")); return FALSE; } @@ -969,7 +969,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) } if (e_meeting_store_count_actual_attendees (priv->model) < 1) { - e_notice (page, GTK_MESSAGE_ERROR, + e_notice (priv->main, GTK_MESSAGE_ERROR, _("At least one attendee is required.")); return FALSE; } |