diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 28 |
2 files changed, 7 insertions, 28 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 30411808ca..5d6da167b3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ 2003-03-20 Rodrigo Moya <rodrigo@ximian.com> + * importers/ical-importer.c: removed activation of shell_client. + (importer_destroy_cb): no need to unref shell_client. + (connect_to_shell): removed. + (ical_importer_new, vcal_importer_new): don't call connect_to_shell. + +2003-03-20 Rodrigo Moya <rodrigo@ximian.com> + * importers/ical-importer.c (get_uri_from_folder_path): removed. (load_file_fn, vcal_load_file_fn): use physical_uri instead of folderpath. diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 823dc11458..169b090ed6 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -52,7 +52,6 @@ typedef struct { icalcomponent *icalcomp; gboolean folder_contains_events; gboolean folder_contains_tasks; - EvolutionShellClient *shell_client; } ICalImporter; typedef struct { @@ -79,34 +78,9 @@ importer_destroy_cb (gpointer user_data) ici->icalcomp = NULL; } - if (BONOBO_IS_OBJECT (ici->shell_client)) { - bonobo_object_unref (BONOBO_OBJECT (ici->shell_client)); - ici->shell_client = NULL; - } - g_free (ici); } -/* Connects an importer to the Evolution shell */ -static void -connect_to_shell (ICalImporter *ici) -{ - CORBA_Environment ev; - GNOME_Evolution_Shell corba_shell; - - CORBA_exception_init (&ev); - corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); - if (BONOBO_EX (&ev)) { - CORBA_exception_free (&ev); - return; - } - - ici->shell_client = evolution_shell_client_new (corba_shell); - - CORBA_Object_release (corba_shell, &ev); - CORBA_exception_free (&ev); -} - /* This reads in an entire file and returns it. It returns NULL on error. The returned string should be freed. */ static char* @@ -345,7 +319,6 @@ ical_importer_new (void) process_item_fn, NULL, ici); - connect_to_shell (ici); g_object_weak_ref (G_OBJECT (ici->importer), (GWeakNotify) importer_destroy_cb, ici); @@ -464,7 +437,6 @@ vcal_importer_new (void) process_item_fn, NULL, ici); - connect_to_shell (ici); g_object_weak_ref (G_OBJECT (ici->importer), (GWeakNotify) importer_destroy_cb, ici); |