From fbe8356d739ea0af4c4bdf01fe74f00711178ab0 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 11 Feb 2004 15:54:49 +0000 Subject: Fixes #53271 2004-02-11 Rodrigo Moya Fixes #53271 * gui/calendar-component.c (delete_calendar_cb): remove the source from the GnomeCalendar widget also. * gui/tasks-component.c (delete_task_list_cb): ditto. svn path=/trunk/; revision=24704 --- calendar/ChangeLog | 9 +++++++++ calendar/gui/calendar-component.c | 6 ++++-- calendar/gui/e-tasks.c | 2 +- calendar/gui/tasks-component.c | 2 ++ 4 files changed, 16 insertions(+), 3 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 86f552bd32..b55d597b3a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2004-02-11 Rodrigo Moya + + Fixes #53271 + + * gui/calendar-component.c (delete_calendar_cb): remove the source from + the GnomeCalendar widget also. + + * gui/tasks-component.c (delete_task_list_cb): ditto. + 2004-02-11 Kidd Wang * gui/print.c: (print_date_label): guarantee we do have some timezone diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index fbbee6d377..bac26b5e78 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -129,8 +129,8 @@ update_uris_for_selection (CalendarComponent *calendar_component) if (!is_in_selection (selection, old_selected_source)) gnome_calendar_remove_event_source (priv->calendar, old_selected_source); - } - + } + for (l = selection; l; l = l->next) { ESource *selected_source = l->data; @@ -314,6 +314,8 @@ delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp) selected_source)) e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector), selected_source); + else + gnome_calendar_remove_event_source (priv->calendar, selected_source); e_source_group_remove_source (e_source_peek_group (selected_source), selected_source); e_source_list_sync (priv->source_list, NULL); diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 7376e72cb3..5a0b4b56c3 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -443,7 +443,7 @@ set_timezone (ETasks *tasks) zone = calendar_config_get_icaltimezone (); for (l = priv->clients_list; l != NULL; l = l->next) { ECal *client = l->data; - + if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) /* FIXME Error checking */ e_cal_set_default_timezone (client, zone, NULL); diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 294292e427..ec5d4c11f0 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -317,6 +317,8 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp) selected_source)) e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector), selected_source); + else + e_tasks_remove_todo_source (priv->tasks, selected_source); e_source_group_remove_source (e_source_peek_group (selected_source), selected_source); e_source_list_sync (priv->source_list, NULL); -- cgit