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
---
 .../GNOME_Evolution_Calendar_Importer.server.in.in   | 20 ++++++++++----------
 calendar/importers/main.c                            |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'calendar/importers')

diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
index d99aba4647..810905fbfa 100644
--- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
+++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@VERSION@"
 	    type="shlib"
 	    location="@IMPORTERSDIR@/libevolution-calendar-importers.so">
 
@@ -11,12 +11,12 @@
                        _value="Evolution iCalendar importer"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
+	    location="OAFIID:GNOME_Evolution_Calendar_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"
                        _value="iCalendar files (.ics)"/>
@@ -25,12 +25,12 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
+	    location="OAFIID:GNOME_Evolution_Calendar_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"
                        _value="vCalendar files (.vcf)"/>
@@ -39,12 +39,12 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"
+<oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:@VERSION@"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory">
+	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory:@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/calendar/importers/main.c b/calendar/importers/main.c
index ba62d63f8b..d19f98a271 100644
--- a/calendar/importers/main.c
+++ b/calendar/importers/main.c
@@ -29,10 +29,10 @@
 #include <bonobo/bonobo-main.h>
 #include "evolution-calendar-importer.h"
 
-#define IMPORTER_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
-#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"
-#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"
-#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"
+#define IMPORTER_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ImporterFactory:" BASE_VERSION
+#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer:" BASE_VERSION
+#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer:" BASE_VERSION
+#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:" BASE_VERSION
 
 static BonoboObject *
 importer_factory_fn (BonoboGenericFactory *factory, const char *id, void *closure)
-- 
cgit v1.2.3