Basically rewrote this, the import tasks run in another thread. It tells

2004-02-11  Not Zed  <NotZed@Ximian.com>

        * importers/pine-importer.c: Basically rewrote this, the import
        tasks run in another thread.  It tells you more about what's going
        on, and its cancellable.
        (pine_store_settings): changed the meaning of the settings
        slightly, if set it means we've processed them already.

        * mail-component-factory.c (factory): hook in importer factory
        callback.

2004-02-10  Not Zed  <NotZed@Ximian.com>

        * importers/*-importer.c: removed module init, just provide a new
        method.  Updates for api changes.

        * Makefile.am: link mail importers in directly.

        * mail-importer.c: changed to do stuff in-memory with linked
        stuff, moved to importers/.

        * importers/GNOME_Evolution_Mail_Importers.server.in.in: merge all
        importer .server info's here, point them all to the mailer
        factory.  Removed the others.

        * importers/Makefile.am: remove Mailer.idl stuff.  Move all
        importers to a single library.

svn path=/trunk/; revision=24701

1 files changed, 15 insertions, 73 deletions

diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 2e2f8881f2..e713241f59 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -1,9 +1,5 @@
-importersdir = $(privlibdir)/evolution-mail-importers
 
-importers_LTLIBRARIES = liboutlook.la libmbox.la \
-	libevolution-elm-importer.la	\
-	libevolution-pine-importer.la	\
-	libevolution-netscape-importer.la
+privlib_LTLIBRARIES = libevolution-mail-importers.la
 
 INCLUDES = -I.. 					\
 	-I$(srcdir)/..					\
@@ -16,84 +12,30 @@ INCLUDES = -I.. 					\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(IMPORTERS_CFLAGS)
 
-liboutlook_la_SOURCES =				\
-	evolution-outlook-importer.c
-liboutlook_la_LDFLAGS = -avoid-version -module
-
-libmbox_la_SOURCES = evolution-mbox-importer.c \
-		     mozilla-status-headers.h
-libmbox_la_LDFLAGS = -avoid-version -module
-
-IDLS = 			\
-	$(top_srcdir)/mail/Mailer.idl
-
-MAIL_GENERATED_H = 	\
-	Mailer.h
-MAIL_GENERATED_C = 	\
-	Mailer-common.c	\
-	Mailer-skels.c	\
-	Mailer-stubs.c
-MAIL_GENERATED = $(MAIL_GENERATED_C) $(MAIL_GENERATED_H)
-
-$(MAIL_GENERATED_H): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(top_srcdir)/mail/Mailer.idl
-$(MAIL_GENERATED_C): $(MAIL_GENERATED_H)
-
-libevolution_netscape_importer_la_SOURCES =	\
-	$(MAIL_GENERATED)		\
-	netscape-importer.c
-
-libevolution_netscape_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_netscape_importer_la_LIBADD =			\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
+libevolution_mail_importers_la_SOURCES =	\
+	mail-importer.c				\
+	mail-importer.h				\
+	elm-importer.c				\
+	pine-importer.c				\
+	netscape-importer.c			\
+	evolution-outlook-importer.c		\
+	evolution-mbox-importer.c
+
+libevolution_mail_importers_la_LIBADD =				\
+	$(top_builddir)/shell/importer/libevolution-importer.la	\
 	$(top_builddir)/camel/libcamel.la			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(IMPORTERS_LIBS)
 
-libevolution_elm_importer_la_SOURCES =	\
-	elm-importer.c
-
-libevolution_elm_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_elm_importer_la_LIBADD =				\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(top_builddir)/e-util/libeutil.la			\
-	$(IMPORTERS_LIBS)
-
-libevolution_pine_importer_la_SOURCES =	\
-	pine-importer.c
-
-libevolution_pine_importer_la_LDFLAGS = -avoid-version -module
-
-libevolution_pine_importer_la_LIBADD =				\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/camel/libcamel.la			\
-	$(IMPORTERS_LIBS)
-
-# evolution_gnomecard_importer_SOURCES =	\
-# 	evolution-gnomecard-importer.c
-
-# evolution_gnomecard_importer_LDADD =				\
-#         $(top_builddir)/shell/importer/libevolution-importer.la \
-#         $(top_builddir)/addressbook/backend/ebook/libebook.la   \
-# 	$(top_builddir)/camel/libcamel.la			\
-# 	$(IMPORTERS_LIBS)
-
-
-server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in	\
-	GNOME_Evolution_Mail_Outlook_Importer.server.in.in		\
-	GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in	\
-	GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in	\
-	GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
+server_in_files = \
+	GNOME_Evolution_Mail_Importers.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
-BUILT_SOURCES = $(MAIL_GENERATED) $(server_DATA)
+BUILT_SOURCES = $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = $(server_in_files)