From 7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Mon, 1 Dec 2003 22:14:43 +0000
Subject: 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
---
 calendar/gui/GNOME_Evolution_Calendar.server.in.in | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'calendar/gui/GNOME_Evolution_Calendar.server.in.in')

diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
index d43faeed38..cee3a6a103 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory_2"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@"
             type="shlib"
             location="@COMPONENTDIR@/libevolution-calendar.so">
 
@@ -13,9 +13,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Control:1.0"/>
@@ -31,12 +31,12 @@
 		       _value="Evolution Calendar scheduling message viewer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Component"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Component:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+            location="OAFIID:GNOME_Evolution_Calendar_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="evolution:component_alias" type="string" value="calendar"/>
@@ -48,12 +48,12 @@
 	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
+		<item value="IDL:BonoboControl/calendar-control:@VERSION@"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
 	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
 	</oaf_attribute>
@@ -66,12 +66,12 @@
 	               _value="Evolution Calendar viewer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Component"
+<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Component:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+            location="OAFIID:GNOME_Evolution_Calendar_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="evolution:component_alias" type="string" value="tasks"/>
@@ -83,12 +83,12 @@
 	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"
+<oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/tasks-control:1.0"/>
+		<item value="IDL:BonoboControl/tasks-control:@VERSION@"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
 	        <item value="IDL:Bonobo/PropertyBag:1.0"/>
 	</oaf_attribute>
@@ -101,12 +101,12 @@
 	               _value="Evolution Tasks viewer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+            location="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/>
+		<item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:@VERSION@"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 
@@ -114,12 +114,12 @@
                        _value="Evolution Calendar/Task editor"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_Factory_2">
+	    location="OAFIID:GNOME_Evolution_Calendar_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"
-- 
cgit v1.2.3