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

4 files changed, 33 insertions, 6 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3f3d3a5521..d6ede1b604 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,18 @@
+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.
+
 2003-01-08  Chris Toshok  <toshok@ximian.com>
 
 	* gui/widgets/e-addressbook-view.c: oops, don't include
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index eed681c844..b1b911566e 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -28,6 +28,7 @@
 #include "e-address-popup.h"
 #include "e-address-widget.h"
 #include "e-minicard-control.h"
+#include "select-names/e-select-names-bonobo.h"
 
 #include <bonobo/bonobo-shlib-factory.h>
 
@@ -39,6 +40,7 @@
 #define SHELL_COMPONENT_ID             "OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
 #define ADDRESS_WIDGET_ID              "OAFIID:GNOME_Evolution_Addressbook_AddressWidget"
 #define ADDRESS_POPUP_ID               "OAFIID:GNOME_Evolution_Addressbook_AddressPopup"
+#define SELECT_NAMES_ID                "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
 #define LDAP_STORAGE_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"
 
 
@@ -59,6 +61,8 @@ factory (BonoboGenericFactory *factory,
 		return BONOBO_OBJECT (e_address_popup_new_control ());
 	if (strcmp (component_id, LDAP_STORAGE_CONFIG_CONTROL_ID) == 0)
 		return BONOBO_OBJECT (addressbook_config_control_new ());
+	if (strcmp (component_id, SELECT_NAMES_ID) == 0)
+		return BONOBO_OBJECT (e_select_names_bonobo_new ());
 
 	g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
 	return NULL;
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"/>
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index ad3bb4f8f0..5972f3f4db 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -1,5 +1,7 @@
 # CORBA stuff
 
+componentdir = $(COMPONENT_DIR)
+
 idl_DATA = \
 	Evolution-Addressbook-SelectNames.idl
 
@@ -20,7 +22,7 @@ server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
 serverdir = $(libdir)/bonobo/servers
 server_DATA = $(server_in_files:.server.in.in=.server)
 $(server_in_files:.server.in.in=.server.in): $(server_in_files)
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
@@ -56,8 +58,6 @@ libeselectnames_la_SOURCES = 			\
 	e-select-names-bonobo.h			\
 	e-select-names-completion.c		\
 	e-select-names-completion.h		\
-	e-select-names-factory.c		\
-	e-select-names-factory.h		\
 	e-select-names-manager.c		\
 	e-select-names-manager.h		\
 	e-select-names-marshal.c		\
@@ -74,6 +74,12 @@ libeselectnames_la_SOURCES = 			\
 	e-simple-card-bonobo.c			\
 	e-simple-card-bonobo.h
 
+# We'll need these again when we split out the select names control
+# into its own shlib factory, but for now they're redundant.
+#
+#	e-select-names-factory.c
+#	e-select-names-factory.h
+
 # GLib marshalling cruft
 
 e-select-names-marshal.h: e-select-names-marshal.list