From 093937a09306fc4f6f2cfb730d5e58c8b7d39e25 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Sun, 21 Dec 2003 17:05:24 +0000 Subject: rewrite for new ecal api, cache all ecal's by type and minimize loading. 2003-12-21 JP Rosevear * gui/e-itip-control.[hc]: rewrite for new ecal api, cache all ecal's by type and minimize loading. Switch to using the source option menu * conduits/todo/todo-conduit.c (start_calendar_server): ditto * conduits/calendar/calendar-conduit.c (start_calendar_server): use ECalSourceType * importers/icalendar-importer.c (load_file_fn): ditto (vcal_load_file_fn): ditto (gnome_calendar_import_data_fn): ditto * gui/dialogs/task-page.c (source_changed_cb): ditto * gui/dialogs/event-page.c (source_changed_cb): ditto * gui/dialogs/copy-source-dialog.h: update proto * gui/dialogs/copy-source-dialog.c (copy_source_dialog): ditto * gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): ditto * gui/tasks-component.c (copy_task_list_cb): ditto (setup_create_ecal): ditto * gui/gnome-cal.c (gnome_calendar_construct): ditto (gnome_calendar_add_event_uri): ditto * gui/e-tasks.c (e_tasks_add_todo_uri): ditto * gui/comp-editor-factory.c (open_client): ditto * gui/calendar-offline-handler.c (backend_go_offline): ditto (backend_go_online): ditto (calendar_offline_handler_init): ditto * gui/calendar-component.c (copy_calendar_cb): ditto (setup_create_ecal): ditto * gui/print.c (print_month_small): don't pass type to e_cal_generate_instances (print_day_details): ditto (print_week_summary): ditto * gui/tag-calendar.c (tag_calendar_by_client): ditto svn path=/trunk/; revision=23994 --- calendar/importers/icalendar-importer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index ae9a5c9b21..ba9478ac8f 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -374,9 +374,9 @@ load_file_fn (EvolutionImporter *importer, /* create ECal's */ if (!ici->client) - ici->client = e_cal_new_from_uri (real_uri, CALOBJ_TYPE_EVENT); + ici->client = e_cal_new_from_uri (real_uri, E_CAL_SOURCE_TYPE_EVENT); if (!ici->tasks_client) - ici->tasks_client = e_cal_new_from_uri ("", CALOBJ_TYPE_TODO); /* FIXME */ + ici->tasks_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_TODO); /* FIXME */ if (e_cal_open (ici->client, TRUE, NULL) && e_cal_open (ici->tasks_client, FALSE, NULL)) { @@ -526,9 +526,9 @@ vcal_load_file_fn (EvolutionImporter *importer, /* create ECal's */ if (!ici->client) - ici->client = e_cal_new_from_uri (real_uri, CALOBJ_TYPE_EVENT); + ici->client = e_cal_new_from_uri (real_uri, E_CAL_SOURCE_TYPE_EVENT); if (!ici->tasks_client) - ici->tasks_client = e_cal_new_from_uri ("", CALOBJ_TYPE_TODO); + ici->tasks_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_TODO); if (e_cal_open (ici->client, TRUE, NULL) && e_cal_open (ici->tasks_client, FALSE, NULL)) { @@ -614,13 +614,13 @@ gnome_calendar_import_data_fn (EvolutionIntelligentImporter *ii, /* Try to open the default calendar & tasks folders. */ if (ici->do_calendar) { - calendar_client = e_cal_new_from_uri ("", CALOBJ_TYPE_EVENT); /* FIXME: use default folder */ + calendar_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_EVENT); /* FIXME: use default folder */ if (!e_cal_open (calendar_client, FALSE, NULL)) goto out; } if (ici->do_tasks) { - tasks_client = e_cal_new_from_uri ("", CALOBJ_TYPE_TODO); /* FIXME: use default folder */ + tasks_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_TODO); /* FIXME: use default folder */ if (!e_cal_open (tasks_client, FALSE, NULL)) goto out; } -- cgit v1.2.3