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

18 files changed, 81 insertions, 65 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9e8554cc40..8d1e933446 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,19 @@
+2003-12-01  Rodney Dawes  <dobey@ximian.com>
+
+	* GNOME_Evlution_Mail.server.in.in:
+	* em-account-prefs.c:
+	* em-composer-prefs.c:
+	* em-mailer-prefs.h:
+	* mail-component-factory.c:
+	* mail-config-factory.c:
+	* mail-font-prefs.h:
+	* importers/*.server.in.in:
+	* importers/elm-importer.c:
+	* importers/evolution-mbox-importer.c:
+	* importers/evolution-outlook-importer.c:
+	* importers/netscape-importer.c:
+	* importers/pine-importer.c: Use BASE_VERSION for repo_ids and OAFIIDs
+
 2003-12-01  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* em-composer-utils.c (composer_get_message): rfc2047 encode the
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 328b70587f..b52a80267b 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -3,7 +3,7 @@
   <!-- Folder display control -->
 
   <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Factory_2"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@"
 	      type="shlib"
 	      location="@COMPONENTDIR@/libevolution-mail.so">
 
@@ -16,12 +16,12 @@
   </oaf_server>
 
   <!-- (control) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:BonoboControl/evolution-mail:1.0"/>
+      <item value="IDL:BonoboControl/evolution-mail:@VERSION@"/>
       <item value="IDL:GNOME/Control:1.0"/>
     </oaf_attribute>
 
@@ -31,12 +31,12 @@
 
   <!-- Component Interface -->
 
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Component_2"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Component:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/Component:1.0"/>
+      <item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="name" type="string" _value="Evolution Mail component"/>
@@ -57,12 +57,12 @@
 
   <!-- Shell Component -->
 
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
+      <item value="IDL:GNOME/Evolution/ShellComponent:@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="name" type="string"
@@ -77,12 +77,12 @@
   <!-- Message composer -->
 
   <!-- (composer) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution:Composer:1.0"/>
+      <item value="IDL:GNOME/Evolution:Composer:@VERSION@"/>
       <item value="IDL:Bonobo/ItemContainer:1.0"/>
     </oaf_attribute>
 
@@ -93,12 +93,12 @@
   <!-- Startup Wizard -->
 
   <!-- (wizard) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
+	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/StartupWizard:1.0"/>
+      <item value="IDL:GNOME/Evolution/StartupWizard::@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="evolution:startup_wizard:priority" type="number"
@@ -109,12 +109,12 @@
   <!-- Configuration pages -->
 
   <!-- Account Editor -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl_2"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
+      <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="evolution2:config_item:title" type="string"
@@ -138,12 +138,12 @@
   </oaf_server>
 
   <!-- Mailer Preferences -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl_2"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
+      <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="evolution2:config_item:title" type="string"
@@ -163,12 +163,12 @@
   </oaf_server>
 
   <!-- Composer Preferences -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl_2"
+  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Factory_2">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
+      <item value="IDL:GNOME/Evolution/ConfigControl:@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="evolution2:config_item:title" type="string"
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index 1fa3b66d58..cff22fdc51 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -90,7 +90,7 @@ GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell);
 void em_account_prefs_apply (EMAccountPrefs *prefs);
 
 /* needed by global config */
-#define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl_2"
+#define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl:" BASE_VERSION
 
 #ifdef __cplusplus
 }
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index e3582d6031..70b5eb15eb 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -121,7 +121,7 @@ void em_composer_prefs_apply (EMComposerPrefs *prefs);
 MailConfigSignature *em_composer_prefs_new_signature (GtkWindow *parent, gboolean html, const char *script);
 
 /* needed by global config */
-#define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl_2"
+#define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl:" BASE_VERSION
 
 #ifdef __cplusplus
 }
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index acd6e88d07..0555d03b06 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -115,7 +115,7 @@ GtkWidget *em_mailer_prefs_new (void);
 void em_mailer_prefs_apply (EMMailerPrefs *prefs);
 
 /* needed by global config */
-#define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl_2"
+#define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl:" BASE_VERSION
 
 #ifdef __cplusplus
 }
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*/
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
index b779329926..cd3416de85 100644
--- a/mail/mail-component-factory.c
+++ b/mail/mail-component-factory.c
@@ -45,13 +45,13 @@
 #include <string.h>
 
 
-#define FACTORY_ID	"OAFIID:GNOME_Evolution_Mail_Factory_2"
+#define FACTORY_ID	"OAFIID:GNOME_Evolution_Mail_Factory:" BASE_VERSION
 
-#define COMPONENT_ID	"OAFIID:GNOME_Evolution_Mail_Component_2"
-#define COMPOSER_ID	"OAFIID:GNOME_Evolution_Mail_Composer"
-#define FOLDER_INFO_ID	"OAFIID:GNOME_Evolution_FolderInfo"
-#define MAIL_CONFIG_ID	"OAFIID:GNOME_Evolution_MailConfig"
-#define WIZARD_ID	"OAFIID:GNOME_Evolution_Mail_Wizard"
+#define COMPONENT_ID	"OAFIID:GNOME_Evolution_Mail_Component:" BASE_VERSION
+#define COMPOSER_ID	"OAFIID:GNOME_Evolution_Mail_Composer:" BASE_VERSION
+#define FOLDER_INFO_ID	"OAFIID:GNOME_Evolution_FolderInfo:" BASE_VERSION
+#define MAIL_CONFIG_ID	"OAFIID:GNOME_Evolution_MailConfig:" BASE_VERSION
+#define WIZARD_ID	"OAFIID:GNOME_Evolution_Mail_Wizard:" BASE_VERSION
 
 
 static BonoboObject *
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
index e2c205de94..9a6170796a 100644
--- a/mail/mail-config-factory.c
+++ b/mail/mail-config-factory.c
@@ -33,7 +33,7 @@
 
 #include "mail-config-factory.h"
 
-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory"
+#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory:" BASE_VERSION
 
 
 typedef void (*ApplyFunc) (GtkWidget *prefs);
diff --git a/mail/mail-font-prefs.h b/mail/mail-font-prefs.h
index 14a1d20b40..87266734a9 100644
--- a/mail/mail-font-prefs.h
+++ b/mail/mail-font-prefs.h
@@ -58,7 +58,7 @@ GtkType      mail_font_prefs_get_type (void);
 GtkWidget *  mail_font_prefs_new (void);
 void         mail_font_prefs_apply (MailFontPrefs *prefs);
 
-#define MAIL_FONT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl"
+#define MAIL_FONT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl:" BASE_VERSION
 
 #ifdef __cplusplus
 }