From fc6c2cd99b5b24a7957af9df611574ca30fa9bed Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 18 Nov 2002 11:36:50 +0000 Subject: Added back libevolution-importer stuff. (SUBDIRS): Added back importers. 2002-11-18 Not Zed * Makefile.am (evolution_mail_LDADD): Added back libevolution-importer stuff. (SUBDIRS): Added back importers. * importers/evolution-mbox-importer.c (load_file_fn): build the uri without deprecated funcs. (load_file_fn): dont free/alloc a camel_exception for no obvious purpose. (mbox_factory_fn): use weak_ref rather than destroy. (importer_destroy_cb): fix signature for weak ref notify. (mbox_factory_fn): add cid param. * importers/*.[ch]: ran fix script over everything. * importers/*.server.in.in: Added bonobo activation files. Moved evolution-mail to @LIBEXEC@ as below. * importers/Makefile.am: oaf->bonobo activation stuff. * importers/evolution-outlook-importer.c (outlook_factory_fn): Add component id to callback. svn path=/trunk/; revision=18822 --- mail/importers/evolution-outlook-importer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mail/importers/evolution-outlook-importer.c') diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c index 977d610055..8079ca3e33 100644 --- a/mail/importers/evolution-outlook-importer.c +++ b/mail/importers/evolution-outlook-importer.c @@ -281,6 +281,7 @@ load_file_fn (EvolutionImporter *eimporter, static BonoboObject * outlook_factory_fn (BonoboGenericFactory *_factory, + const char *cid, void *closure) { EvolutionImporter *importer; @@ -290,8 +291,8 @@ outlook_factory_fn (BonoboGenericFactory *_factory, importer = evolution_importer_new (support_format_fn, load_file_fn, process_item_fn, NULL, oli); - gtk_signal_connect (GTK_OBJECT (importer), "destroy", - GTK_SIGNAL_FUNC (importer_destroy_cb), oli); + g_signal_connect((importer), "destroy", + G_CALLBACK (importer_destroy_cb), oli); return BONOBO_OBJECT (importer); } -- cgit v1.2.3