diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/importers/Makefile.am | 2 | ||||
| -rw-r--r-- | mail/importers/evolution-outlook-importer.c | 12 |
3 files changed, 15 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index debbc571fc..7bd0ac3c06 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2002-11-20 Not Zed <NotZed@Ximian.com> + + * importers/Makefile.am (%.server.in): provide a proper implicit + rule for building .server.in from .server.in.in. The other one + just copied the first target to all destinations(!). + + * importers/evolution-outlook-importer.c (outlook_factory_fn): + destroy -> weak ref. + 2002-11-19 Jeffrey Stedfast <fejj@ximian.com> * mail-preferences.c (mail_preferences_apply): Save the settings diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 49f9b17af7..7300acb9f2 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -23,7 +23,7 @@ serverdir = $(libdir)/bonobo/servers server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \ GNOME_Evolution_Mail_Outlook_Importer.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) -$(server_in_files:.server.in.in=.server.in): $(server_in_files) +%.server.in: %.server.in.in sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ EXTRA_DIST = $(server_in_files) $(server_DATA) diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c index 8079ca3e33..2737aa592a 100644 --- a/mail/importers/evolution-outlook-importer.c +++ b/mail/importers/evolution-outlook-importer.c @@ -206,14 +206,13 @@ support_format_fn (EvolutionImporter *importer, } static void -importer_destroy_cb (GtkObject *object, - OutlookImporter *oli) +importer_destroy_cb (void *data, GObject *object) { - MailImporter *importer; + OutlookImporter *oli = data; + MailImporter *importer = data; - importer = (MailImporter *) oli; if (importer->folder) - camel_object_unref (CAMEL_OBJECT (importer->folder)); + camel_object_unref (importer->folder); g_free (oli->filename); if (oli->handle) @@ -291,8 +290,7 @@ outlook_factory_fn (BonoboGenericFactory *_factory, importer = evolution_importer_new (support_format_fn, load_file_fn, process_item_fn, NULL, oli); - g_signal_connect((importer), "destroy", - G_CALLBACK (importer_destroy_cb), oli); + g_object_weak_ref((GObject *)importer, importer_destroy_cb, oli); return BONOBO_OBJECT (importer); } |