diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 4 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/memos-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7f40efb87c..a774288a9f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2008-09-23 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #553273 + + * gui/alarm-notify/alarm-queue.c: (edit_component): + * gui/tasks-component.c: (delete_task_list_cb): + * gui/calendar-component.c: (delete_calendar_cb): + * gui/memos-component.c: (delete_memo_list_cb): + Always end e_error_run/e_error_new calls with NULL parameter. + 2008-09-19 Sankar P <psankar@novell.com> License Changes diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 1e7f498f7a..f320ccc42b 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -930,7 +930,7 @@ edit_component (ECal *client, ECalComponent *comp) 0, NULL, &ev); if (BONOBO_EX (&ev)) { - e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev)); + e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL); CORBA_exception_free (&ev); return; } @@ -947,7 +947,7 @@ edit_component (ECal *client, ECalComponent *comp) GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev); if (BONOBO_EX (&ev)) - e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev)); + e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL); CORBA_exception_free (&ev); diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 5ba3b11e96..080858c448 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -568,7 +568,7 @@ delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) return; if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget), - "calendar:prompt-delete-calendar", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + "calendar:prompt-delete-calendar", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* first, ask the backend to remove the calendar */ diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index adf54c5c2d..cee6031404 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -415,7 +415,7 @@ delete_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) return; if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget), - "calendar:prompt-delete-memo-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + "calendar:prompt-delete-memo-list", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* first, ask the backend to remove the memo list */ diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index ac272c83d1..03bc48db2e 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -406,7 +406,7 @@ delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) return; if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget), - "calendar:prompt-delete-task-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + "calendar:prompt-delete-task-list", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* first, ask the backend to remove the task list */ |