[monkey-bubble: 295/753] Use GnomeSelectorFactory

[Sven Herzberg <herzi src gnome org>]

commit 7b66b9e9a6ed0a2c7ee5904d2d9f372bf94a21a7
Author: Martin Baulig <baulig suse de>
Date:   Sun May 20 14:21:42 2001 +0000

    Use GnomeSelectorFactory
    
    2001-05-20  Martin Baulig  <baulig suse de>
    
    	* libgnomeui-components.c: Use GnomeSelectorFactory

 components/ChangeLog                  |    4 ++++
 components/GNOME_UI_Components.oaf.in |    4 ++--
 components/libgnomeui-components.c    |   13 +++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/components/ChangeLog b/components/ChangeLog
index f86b791..e5be7b6 100644
--- a/components/ChangeLog
+++ b/components/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-20  Martin Baulig  <baulig suse de>
+
+	* libgnomeui-components.c: Use GnomeSelectorFactory
+
 2001-05-19  Martin Baulig  <baulig suse de>
 
 	* gnome-image-entry-component.[ch]: Moved here from ../libgnomeui.
diff --git a/components/GNOME_UI_Components.oaf.in b/components/GNOME_UI_Components.oaf.in
index 5341feb..7edcb78 100644
--- a/components/GNOME_UI_Components.oaf.in
+++ b/components/GNOME_UI_Components.oaf.in
@@ -10,7 +10,7 @@
 
 <oaf_server iid="OAFIID:GNOME_UI_Component_IconSelector" type="factory" location="OAFIID:GNOME_UI_Components_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Selector:1.0"/>
+		<item value="IDL:GNOME/SelectorFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="name" type="string" value="GNOME Icon Selector"/>
@@ -18,7 +18,7 @@
 
 <oaf_server iid="OAFIID:GNOME_UI_Component_ImageEntry" type="factory" location="OAFIID:GNOME_UI_Components_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
+		<item value="IDL:GNOME/SelectorFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="name" type="string" value="GNOME Image Entry"/>
diff --git a/components/libgnomeui-components.c b/components/libgnomeui-components.c
index 27e03ff..4402639 100644
--- a/components/libgnomeui-components.c
+++ b/components/libgnomeui-components.c
@@ -32,6 +32,7 @@
 #include <bonobo/bonobo-ui-main.h>
 #include <bonobo/bonobo-shlib-factory.h>
 #include <bonobo/bonobo-item-handler.h>
+#include <libgnome/gnome-selector-factory.h>
 #include "gnome-icon-selector-component.h"
 #include "gnome-image-entry-component.h"
 
@@ -99,10 +100,18 @@ libgnomeui_components_factory (BonoboGenericFactory *this,
     g_message (G_STRLOC ": `%s'", object_id);
 
     if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_IconSelector")) {
-	GnomeSelector *selector = g_object_new (gnome_icon_selector_component_get_type (), NULL);
+	GnomeSelectorFactory *factory;
 
-	return BONOBO_OBJECT (selector);
+	factory = gnome_selector_factory_new (gnome_icon_selector_component_get_type ());
+
+	return BONOBO_OBJECT (factory);
     } else if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_ImageEntry")) {
+	GnomeSelectorFactory *factory;
+
+	factory = gnome_selector_factory_new (gnome_image_entry_component_get_type ());
+
+	return BONOBO_OBJECT (factory);
+    } else if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_ImageEntry_Item")) {
 	BonoboItemHandler *item_handler;
 
 	item_handler = bonobo_item_handler_new (NULL, image_entry_get_object_fn, NULL);