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_Addressbook_SelectNames.server.in.in          | 8 ++++----
 addressbook/gui/component/select-names/e-select-names-bonobo.c    | 2 +-
 addressbook/gui/component/select-names/e-select-names-factory.c   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'addressbook/gui/component/select-names')

diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
index 9ef1c6d06d..0a9f975463 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <!--
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory_2"
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory:@VERSION@"
             type="shlib"
             location="@COMPONENTDIR@/libevolution-addressbook.so">
 
@@ -15,12 +15,12 @@
 </oaf_server>
 -->
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames_2"
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames:@VERSION@"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_Factory_2">
+            location="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@">
 
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
+		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames:@VERSION@"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index f10fa3b804..73c415c6c6 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -500,7 +500,7 @@ impl_SelectNames_activate_dialog (PortableServer_Servant servant,
 	priv = select_names->priv;
 
 	shell = bonobo_activation_activate_from_id  (
-		"OAFIID:GNOME_Evolution_Shell",
+		"OAFIID:GNOME_Evolution_Shell:" BASE_VERSION,
 		Bonobo_ACTIVATION_FLAG_EXISTING_ONLY,
 		NULL, ev);
 	if (BONOBO_EX (ev))
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
index 902449ba85..9e427513e0 100644
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ b/addressbook/gui/component/select-names/e-select-names-factory.c
@@ -30,7 +30,7 @@
 #include "e-select-names-factory.h"
 
 
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory_2"
+#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory:" BASE_VERSION
 
 static BonoboGenericFactory *factory = NULL;
 
-- 
cgit v1.2.3