Use BASE_VERSION for repo_ids and OAFIIDs Update killev to kill the

2003-12-01  Rodney Dawes  <dobey@ximian.com>

	* Use BASE_VERSION for repo_ids and OAFIIDs
  * Update killev to kill the correct versions of gnome-spell and the
    GtkHTML Editor

svn path=/trunk/; revision=23543

10 files changed, 29 insertions, 29 deletions

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 7b2e60b8f2..c9f1c985d1 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,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:@VERSION@"
 	    type="exe"
 	    location="@BINDIR@/evolution-@VERSION@">
 
@@ -12,12 +12,12 @@
 		       _value="Evolution Elm importer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory">
+	    location="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
+		<item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
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 5b2096d3ea..72e634bd6a 100644
--- a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory:@VERSION@"
 	    type="exe"
 	    location="@BINDIR@/evolution-@VERSION@">
 
@@ -12,12 +12,12 @@
 		       _value="Evolution mbox importer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory">
+	    location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
+		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
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 795e441098..83302a5402 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,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory:@VERSION@"
 	    type="exe"
 	    location="@BINDIR@/evolution-@VERSION@">
 
@@ -12,12 +12,12 @@
 		       _value="Evolution Netscape Mail importer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory">
+	    location="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
+		<item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
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 1dc90779f8..49963ca2a6 100644
--- a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory:@VERSION@"
 	    type="exe"
 	    location="@BINDIR@/evolution-@VERSION@">
 
@@ -12,12 +12,12 @@
 		       _value="Evolution Outlook Express 4 importer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory">
+	    location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
+		<item value="IDL:GNOME/Evolution/Importer:@VERSION@"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution:menu_name" type="string"
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 5cdf7cbe35..b81789c291 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,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory:@VERSION@"
 	    type="exe"
 	    location="@BINDIR@/evolution-@VERSION@">
 
@@ -12,12 +12,12 @@
 		       _value="Evolution Pine importer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory">
+	    location="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
+		<item value="IDL:GNOME/Evolution/IntelligentImporter:@VERSION@"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index bfe2ffcd95..1386e3a26f 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -54,8 +54,8 @@
 
 #include "mail/mail-importer.h"
 
-#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"
-#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
+#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory:" BASE_VERSION
+#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION
 #define KEY "elm-mail-imported"
 
 /*#define SUPER_IMPORTER_DEBUG*/
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 134f6b9233..83323703af 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -55,7 +55,7 @@
 #define OUT
 #endif
 
-#define MBOX_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
+#define MBOX_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory:" BASE_VERSION
 
 typedef struct {
 	MailImporter importer; /* Parent */
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c
index 1b250fc8ff..62d99bb149 100644
--- a/mail/importers/evolution-outlook-importer.c
+++ b/mail/importers/evolution-outlook-importer.c
@@ -41,7 +41,7 @@
 #include "mail-tools.h"
 
 
-#define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
+#define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory:" BASE_VERSION
 
 extern char *evolution_dir;
 typedef struct {
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 650e2432a3..a0610ca1b4 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -74,9 +74,9 @@ EvolutionShellClient *global_shell_client = NULL;
 
 static char          *filter_name = N_("Priority Filter \"%s\"");
 
-#define FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"
-#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
-#define MAIL_CONFIG_IID "OAFIID:GNOME_Evolution_MailConfig"
+#define FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory:" BASE_VERSION
+#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION
+#define MAIL_CONFIG_IID "OAFIID:GNOME_Evolution_MailConfig:" BASE_VERSION
 
 #define KEY "netscape-mail-imported"
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 54ffe2e51c..89cfcc2fdc 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -59,8 +59,8 @@
 #include <ebook/e-book.h>
 #include <ebook/e-card-simple.h>
 
-#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
-#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
+#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory:" BASE_VERSION
+#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION
 #define KEY "pine-mail-imported"
 
 /*#define SUPER_IMPORTER_DEBUG*/