From 7b52cce57f0fdcf493d2980948eaf5440c1b2a39 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Mon, 29 Mar 2004 22:06:54 +0000 Subject: don't require client to be loaded in order to remove the source 2004-03-29 William Jon McCann * gui/tasks-component.c (delete_task_list_cb): * gui/calendar-component.c (delete_calendar_cb): don't require client to be loaded in order to remove the source svn path=/trunk/; revision=25234 --- calendar/ChangeLog | 5 +++-- calendar/gui/calendar-component.c | 2 ++ calendar/gui/tasks-component.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4ab12a5148..085624b9ad 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,7 +1,8 @@ 2004-03-29 William Jon McCann - * gui/migration.c (create_task_sources, migrate_tasks): create - On The Web source group for tasks. + * gui/tasks-component.c (delete_task_list_cb): + * gui/calendar-component.c (delete_calendar_cb): + don't require client to be loaded in order to remove the source 2004-03-29 Hari Prasad Nadig diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 0f6b0393ef..db6fdabe7d 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -379,6 +379,8 @@ delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp) /* first, ask the backend to remove the calendar */ uri = e_source_get_uri (selected_source); cal = e_cal_model_get_client_for_uri (gnome_calendar_get_calendar_model (priv->calendar), uri); + if (!cal) + cal = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_EVENT); g_free (uri); if (cal) { if (e_cal_remove (cal, NULL)) { diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 2fe0809c74..5b1683a0e4 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -310,6 +310,8 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp) cal = e_cal_model_get_client_for_uri ( e_calendar_table_get_model (E_CALENDAR_TABLE (e_tasks_get_calendar_table (priv->tasks))), uri); + if (!cal) + cal = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_TODO); g_free (uri); if (cal) { if (e_cal_remove (cal, NULL)) { -- cgit v1.2.3