[evolution-patches] 41164, importers busted

[Not Zed <notzed ximian com>]

The shlib change was the wrong one afterall, i should've rechecked fixed
it when i realised the first time.

Anyway this seems to make (mail) importers work as they should:

 Z

? GNOME_Evolution_Mail.oaf
? GNOME_Evolution_Mail.oafinfo
? Mail-common.c
? Mail-skels.c
? Mail-stubs.c
? Mail.h
? a
? a.out
? bak
? blah.c
? blah.ps
? changes.diff
? conf.keys
? diff
? econf.h
? mail-config.c.save
? mail-config.evolution
? mail-send-recv.c.save
? message-list.c.save
? ml.diff
? old
? out
? store_change.diff
? subscribe-dialog-new.c
? subscribe-dialog.c.new
? subscribe-dialog.c.new2
? test-mt
? typescript
? importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
? importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf.in
? importers/GNOME_Evolution_Mail_Mbox_Importer.oaf
? importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
? importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf.in
? importers/GNOME_Evolution_Mail_Outlook_Importer.oaf
? importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
? importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf.in
? importers/am.diff
? importers/b
? importers/elm-importer.c.new
? importers/elm.ps
? importers/im.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2695
diff -u -3 -r1.2695 ChangeLog
--- ChangeLog	16 Apr 2003 05:03:22 -0000	1.2695
+++ ChangeLog	17 Apr 2003 02:12:57 -0000
@@ -1,3 +1,19 @@
+2003-04-17  Not Zed  <NotZed Ximian com>
+
+
+2003-04-16  Not Zed  <NotZed Ximian com>
+
+	* importers/Makefile.am (%.server.in): Remove COMPONENTDIR and set
+	BINDIR and VERSION instead.
+
+	* (importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in,
+	importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in,
+	importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in,
+	importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in,
+	importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:) :
+	Convert the type back to exe, and point to the main evolution
+	executable.  Fixes #41164.
+
 2003-04-15  Not Zed  <NotZed Ximian com>
 
 	* For bug #41199.
Index: importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in,v
retrieving revision 1.3
diff -u -3 -r1.3 GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
--- importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in	8 Apr 2003 14:23:03 -0000	1.3
+++ importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in	17 Apr 2003 02:12:57 -0000
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"
-	    type="shlib"
-	    location="@COMPONENTDIR@/libevolution-mail.so">
+	    type="exe"
+	    location="@BINDIR@/evolution- VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
Index: importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in,v
retrieving revision 1.3
diff -u -3 -r1.3 GNOME_Evolution_Mail_Mbox_Importer.server.in.in
--- importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in	7 Apr 2003 16:08:50 -0000	1.3
+++ importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in	17 Apr 2003 02:12:57 -0000
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="shlib"
-	    location="@COMPONENTDIR@/libevolution-mail.so">
+	    type="exe"
+	    location="@BINDIR@/evolution- VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
Index: importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in,v
retrieving revision 1.3
diff -u -3 -r1.3 GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
--- importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in	8 Apr 2003 14:23:03 -0000	1.3
+++ importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in	17 Apr 2003 02:12:57 -0000
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"
-	    type="shlib"
-	    location="@COMPONENTDIR@/libevolution-mail.so">
+	    type="exe"
+	    location="@BINDIR@/evolution- VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
Index: importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in,v
retrieving revision 1.3
diff -u -3 -r1.3 GNOME_Evolution_Mail_Outlook_Importer.server.in.in
--- importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in	7 Apr 2003 16:08:51 -0000	1.3
+++ importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in	17 Apr 2003 02:12:57 -0000
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="shlib"
-	    location="@COMPONENTDIR@/libevolution-mail.so">
+	    type="exe"
+	    location="@BINDIR@/evolution- VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
Index: importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in,v
retrieving revision 1.3
diff -u -3 -r1.3 GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
--- importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in	8 Apr 2003 14:23:03 -0000	1.3
+++ importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in	17 Apr 2003 02:12:57 -0000
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
-	    type="shlib"
-	    location="@COMPONENTDIR@/libevolution-mail.so">
+	    type="exe"
+	    location="@BINDIR@/evolution- VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
Index: importers/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/Makefile.am,v
retrieving revision 1.22
diff -u -3 -r1.22 Makefile.am
--- importers/Makefile.am	7 Apr 2003 16:08:51 -0000	1.22
+++ importers/Makefile.am	17 Apr 2003 02:12:57 -0000
@@ -91,8 +91,9 @@
 	GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)
 %.server.in: %.server.in.in
-	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
-
+	sed -e "s|\ BINDIR\@|$(bindir)|"				\
+	    -e "s|\ VERSION\@|$(BASE_VERSION)|"				\
+	    $< > $@
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)