[monkey-bubble: 448/753] Moved to libgnome-extras/components. Likewise. Likewise. Likewise.

[Sven Herzberg <herzi src gnome org>]

commit e430f00e37d9d017c72e7ab04aa4b55e01547e1a
Author: Martin Baulig <baulig suse de>
Date:   Wed Jun 13 18:31:01 2001 +0000

    Moved to libgnome-extras/components. Likewise. Likewise. Likewise.
    
    2001-06-13  Martin Baulig  <baulig suse de>
    
    	* gnome-entry-component.[ch]: Moved to libgnome-extras/components.
    	* gnome-icon-selector-component.[ch]: Likewise.
    	* gnome-image-entry-component.[ch]: Likewise.
    	* selector-components.xmldb: Likewise.

 components/ChangeLog                  |    7 ++
 components/GNOME_UI_Components.oaf.in |   62 --------------------
 components/Makefile.am                |    9 ---
 components/libgnomeui-components.c    |  100 +--------------------------------
 4 files changed, 9 insertions(+), 169 deletions(-)
---
diff --git a/components/ChangeLog b/components/ChangeLog
index 7061347..44d17f4 100644
--- a/components/ChangeLog
+++ b/components/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-13  Martin Baulig  <baulig suse de>
+
+	* gnome-entry-component.[ch]: Moved to libgnome-extras/components.
+	* gnome-icon-selector-component.[ch]: Likewise.
+	* gnome-image-entry-component.[ch]: Likewise.
+	* selector-components.xmldb: Likewise.
+
 2001-06-04  Martin Baulig  <baulig suse de>
 
 	* gnome-entry-component.c (PROP_IS_FILE_ENTRY): New property.
diff --git a/components/GNOME_UI_Components.oaf.in b/components/GNOME_UI_Components.oaf.in
index 2f0326d..14d327e 100644
--- a/components/GNOME_UI_Components.oaf.in
+++ b/components/GNOME_UI_Components.oaf.in
@@ -8,66 +8,4 @@
 	<oaf_attribute name="name" type="string" value="GNOME UI Components Factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_UI_Component_EntryFactory" type="factory" location="OAFIID:GNOME_UI_Components_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/SelectorFactory:1.0"/>
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME Entry Factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_UI_Component_Entry" 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:Bonobo/Control:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME Entry"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_UI_Component_FileEntry" 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:Bonobo/Control:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME File Entry"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_UI_Component_IconSelectorFactory" type="factory" location="OAFIID:GNOME_UI_Components_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/SelectorFactory:1.0"/>
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME Icon Selector Factory"/>
-</oaf_server>
-
-<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:Bonobo/Control:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME Icon Selector"/>
-</oaf_server>
-
-<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:GNOME/SelectorFactory:1.0"/>
-		<item value="IDL:Bonobo/ItemContainer:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME Image Entry"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_UI_Component_ImageEntry_Item" 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:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="GNOME Image Entry"/>
-</oaf_server>
-
 </oaf_info>
diff --git a/components/Makefile.am b/components/Makefile.am
index 0a011b0..e40b966 100644
--- a/components/Makefile.am
+++ b/components/Makefile.am
@@ -38,19 +38,10 @@ GNOME_UI_Components.oaf : $(srcdir)/GNOME_UI_Components.oaf.in $(top_builddir)/c
 	sed -e "s|\ COMPONENTS_LIBDIR\@|$(componentdir)|" \
 	$(srcdir)/GNOME_UI_Components.oaf.in > GNOME_UI_Components.oaf 
 
-component_DATA = \
-	selector-components.xmldb
-
 clean-local:
 	-rm -f $(OAF_FILES)
 
 libgnomeui_components_2_la_SOURCES = \
-	gnome-icon-selector-component.c			\
-	gnome-icon-selector-component.h			\
-	gnome-image-entry-component.c			\
-	gnome-image-entry-component.h			\
-	gnome-entry-component.c				\
-	gnome-entry-component.h				\
 	libgnomeui-components.c
 
 libgnomeui_components_2_la_LDFLAGS = \
diff --git a/components/libgnomeui-components.c b/components/libgnomeui-components.c
index 8e45a06..30d6f7e 100644
--- a/components/libgnomeui-components.c
+++ b/components/libgnomeui-components.c
@@ -32,60 +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"
-#include "gnome-entry-component.h"
-
-static Bonobo_Unknown
-image_entry_get_object_fn (BonoboItemHandler *h, const char *item_name,
-			   gboolean only_if_exists, gpointer data,
-			   CORBA_Environment *ev)
-{
-    GSList *options, *c;
-    gboolean is_pixmap_entry = FALSE;
-    guint preview_x = 0, preview_y = 0;
-    GnomeSelector *selector = NULL;
-
-    options = bonobo_item_option_parse (item_name);
-
-    for (c = options; c; c = c->next) {
-	BonoboItemOption *option = c->data;
-
-	if (!strcmp (option->key, "type")) {
-	    is_pixmap_entry = !strcmp (option->value, "pixmap");
-	} else if (!strcmp (option->key, "preview-x")) {
-	    preview_x = atoi (option->value);
-	} else if (!strcmp (option->key, "preview-y")) {
-	    preview_y = atoi (option->value);
-	} else {
-	    g_warning (G_STRLOC ": unknown option `%s'", option->key);
-	}
-    }
-
-    if (is_pixmap_entry) {
-	if ((preview_x > 0) && (preview_y) > 0)
-	    selector = g_object_new (gnome_image_entry_component_get_type (),
-				     "is_pixmap_entry", TRUE,
-				     "preview_x", preview_x,
-				     "preview_y", preview_y,
-				     NULL);
-	else
-	    selector = g_object_new (gnome_image_entry_component_get_type (),
-				     "is_pixmap_entry", TRUE,
-				     NULL);
-    } else {
-	selector = g_object_new (gnome_image_entry_component_get_type (),
-				 "is_pixmap_entry", FALSE,
-				 NULL);
-    }
-
-    bonobo_item_options_free (options);
-
-    bonobo_object_dump_interfaces (BONOBO_OBJECT (selector));
-
-    return BONOBO_OBJREF (selector);
-}
+#include <libbonobo.h>
 
 static BonoboObject *
 libgnomeui_components_factory (BonoboGenericFactory *this, 
@@ -98,50 +45,7 @@ libgnomeui_components_factory (BonoboGenericFactory *this,
 	initialized = TRUE;             
     }
 
-    if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_IconSelectorFactory")) {
-	GnomeSelectorFactory *factory;
-
-	factory = gnome_selector_factory_new (gnome_icon_selector_component_get_type ());
-
-	return BONOBO_OBJECT (factory);
-    } else if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_IconSelector")) {
-	GnomeSelector *selector;
-
-	selector = g_object_new (gnome_icon_selector_component_get_type (), NULL);
-
-	return BONOBO_OBJECT (selector);
-    } 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);
-
-	return BONOBO_OBJECT (item_handler);
-    } else if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_EntryFactory")) {
-	GnomeSelectorFactory *factory;
-
-	factory = gnome_selector_factory_new (gnome_entry_component_get_type ());
-
-	return BONOBO_OBJECT (factory);
-    } else if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_Entry")) {
-	GnomeSelector *selector;
-
-	selector = g_object_new (gnome_entry_component_get_type (), "is-file-entry", FALSE, NULL);
-
-	return BONOBO_OBJECT (selector);
-    } else if (!strcmp (object_id, "OAFIID:GNOME_UI_Component_FileEntry")) {
-	GnomeSelector *selector;
-
-	selector = g_object_new (gnome_entry_component_get_type (), "is-file-entry", TRUE, NULL);
-
-	return BONOBO_OBJECT (selector);
-    } else
-	g_warning ("Failing to manufacture a '%s'", object_id);
+    g_warning ("Failing to manufacture a '%s'", object_id);
         
     return NULL;
 }