From e3efaa319aabdfe6b3329fae1b9cee8a0ea877f3 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 11 May 2001 19:57:15 +0000 Subject: add proto 2001-05-11 JP Rosevear * mail-importer.h: add proto * mail-importer.c (mail_importer_uninit): release and unref the local storage * mail-local.c (mail_local_store_finalize): use bonobo_object_release_unref rather than doing Bonobo_Unknow_unref and a corba release (register_folder_registered): "sink" the local_store ref to prevent circular ref (mail_local_storage_shutdown): unref the local store * mail-local.h: new proto * component-factory.c (owner_unset_cb): uninit the importer and shutdown the local storage svn path=/trunk/; revision=9768 --- mail/mail-importer.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mail/mail-importer.c') diff --git a/mail/mail-importer.c b/mail/mail-importer.c index dd30807645..500897ea59 100644 --- a/mail/mail-importer.c +++ b/mail/mail-importer.c @@ -242,6 +242,7 @@ mail_importer_init (EvolutionShellClient *client) void mail_importer_uninit (void) { + CORBA_Environment ev; GList *l; for (l = importer_modules; l; l = l->next) { @@ -250,5 +251,10 @@ mail_importer_uninit (void) g_list_free (importer_modules); importer_modules = NULL; + + CORBA_exception_init (&ev); + bonobo_object_release_unref (local_storage, &ev); + local_storage = NULL; + CORBA_exception_free (&ev); } -- cgit v1.2.3