From 52bf62c8226956d81e0d58133de32139800acbb5 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Thu, 9 Jan 2003 19:17:01 +0000
Subject: comment out the factory oaf_server, and change the location of the

2003-01-09  Chris Toshok  <toshok@ximian.com>

	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in:
	comment out the factory oaf_server, and change the location of the
	SelectNames controls to be
	OAFIID:GNOME_Evolution_Addressbook_Factory so the normal
	addressbook.so will create them.

	* gui/component/select-names/Makefile.am
	(libeselectnames_la_SOURCES): remove the
	e-select-names-factory.[ch] stuff for the time being.

	* gui/component/component-factory.c (factory): we're now (for the
	time being) the factory for the select names control.

svn path=/trunk/; revision=19369
---
 .../GNOME_Evolution_Addressbook_SelectNames.server.in.in          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in')

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 2697741fc7..053d2dcddb 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,8 +1,9 @@
 <oaf_info>
 
+<!--
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-addressbook">
+            type="shlib"
+            location="@COMPONENTDIR@/libevolution-addressbook.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
@@ -12,10 +13,11 @@
                        _value="Factory for the Addressbook's name selection interface"/>
 
 </oaf_server>
+-->
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
+            location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
-- 
cgit