From 76d74ba347a69ecba86bed5b0ab5159eadcc4261 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Mon, 7 Apr 2003 16:08:51 +0000
Subject: Clean up server names

	* GNOME_Evolution_Mail.server.in.in: Clean up server names

	* importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:
	Likewise, and fix evolution-mail location

	* importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in:
	Likewise

	* importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in:
	Likewise

	* importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in:
	Likewise

	* importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in:
	Likewise

	* importers/Makefile.am (%.server.in): Fix this for evolution-mail
	being a shlib.

svn path=/trunk/; revision=20703
---
 ...ME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in |  9 +++++++--
 .../GNOME_Evolution_Mail_Mbox_Importer.server.in.in        | 14 +++++++-------
 ...olution_Mail_Netscape_Intelligent_Importer.server.in.in |  9 +++++++--
 .../GNOME_Evolution_Mail_Outlook_Importer.server.in.in     | 14 +++++++-------
 ...E_Evolution_Mail_Pine_Intelligent_Importer.server.in.in |  9 +++++++--
 mail/importers/Makefile.am                                 |  2 +-
 6 files changed, 36 insertions(+), 21 deletions(-)

(limited to 'mail/importers')

diff --git a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
index 8f6a390137..9a85427a75 100644
--- a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
@@ -1,12 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Elm importer">
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer"
@@ -17,5 +20,7 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Elm importer">
 </oaf_server>
 </oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
index 4e5bbe15cc..61a1dd3b2f 100644
--- a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
@@ -1,15 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import mbox into Evolution"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution mbox importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="MBox (mbox)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports mbox files into Evolution"/>
+		       _value="MBox (mbox)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution mbox importer"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
index 346ad883bc..3536c536ac 100644
--- a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
@@ -1,12 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Netscape Mail importer">
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer"
@@ -17,5 +20,7 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Netscape Mail importer">
 </oaf_server>
 </oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
index 103dd9117f..6af5ece4bc 100644
--- a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
@@ -1,15 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import Outlook Express 4 mails into Evolution"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Outlook Express 4 importer"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
@@ -21,9 +21,9 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
-		       value="Outlook Express 4 (.mbx)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports Outlook Express 4 files into Evolution"/>
+		       _value="Outlook Express 4 (.mbx)"/>
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Outlook Express 4 importer"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
index 4a5e41d5fe..a2e8ea7b21 100644
--- a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
@@ -1,12 +1,15 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-mail">
+	    type="shlib"
+	    location="@COMPONENTDIR@/libevolution-mail.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
+
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Pine importer">
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer"
@@ -17,5 +20,7 @@
 		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
 	</oaf_attribute>
 
+	<oaf_attribute name="name" type="string"
+		       _value="Evolution Pine importer">
 </oaf_server>
 </oaf_info>
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 4bd2bf82de..380acbf13c 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -91,7 +91,7 @@ server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in	\
 	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|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)
-- 
cgit