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

1 files changed, 25 insertions, 25 deletions

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"