[monkey-bubble: 290/753] Moved to ../components. Likewise.

[Sven Herzberg <herzi src gnome org>]

commit 841bbb6eef77384df6237a70e49dc9ea184f3ff7
Author: Martin Baulig <baulig suse de>
Date:   Sat May 19 20:10:45 2001 +0000

    Moved to ../components. Likewise.
    
    2001-05-19  Martin Baulig  <baulig suse de>
    
    	* gnome-image-entry-component.[ch]: Moved to ../components.
    	* gnome-icon-selector-component.[ch]: Likewise.
    
    	* gnome-image-entry.c, gnome-image-selector.c: Use bonobo_get_object()
    	to activate the component.

 libgnomeui/ChangeLog              |    8 ++++++++
 libgnomeui/Makefile.am            |    4 ----
 libgnomeui/gnome-image-entry.c    |   28 +++++++++++++++-------------
 libgnomeui/gnome-image-selector.c |   14 ++++++++------
 libgnomeui/libgnomeui.h           |    1 -
 5 files changed, 31 insertions(+), 24 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index ca46a3d..c0895e8 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-19  Martin Baulig  <baulig suse de>
+
+	* gnome-image-entry-component.[ch]: Moved to ../components.
+	* gnome-icon-selector-component.[ch]: Likewise.
+
+	* gnome-image-entry.c, gnome-image-selector.c: Use bonobo_get_object()
+	to activate the component.
+
 2001-05-10  Martin Baulig  <baulig suse de>
 
 	* gnome-file-entry.h (GnomeFileEntry): Derive from GnomeSelectorClient.
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index 78fa77b..483b993 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -86,8 +86,6 @@ libgnomeui_2_la_SOURCES = \
 	gnome-file-entry.c		\
 	gnome-image-entry.c		\
 	gnome-image-selector.c		\
-	gnome-image-entry-component.c	\
-	gnome-icon-selector-component.c	\
         gnome-font-picker.c		\
 	gnome-href.c			\
 	gnome-ice.c			\
@@ -128,8 +126,6 @@ gnome_headers = \
 	gnome-file-entry.h		\
 	gnome-image-entry.h		\
 	gnome-image-selector.h		\
-	gnome-image-entry-component.h	\
-	gnome-icon-selector-component.h	\
         gnome-font-picker.h		\
 	gnome-gconf.h			\
 	gnome-geometry.h		\
diff --git a/libgnomeui/gnome-image-entry.c b/libgnomeui/gnome-image-entry.c
index ce79f0e..70069c1 100644
--- a/libgnomeui/gnome-image-entry.c
+++ b/libgnomeui/gnome-image-entry.c
@@ -40,6 +40,7 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-image-entry-component.h>
+#include <bonobo/bonobo-moniker-util.h>
 #include "gnome-image-entry.h"
 
 struct _GnomeImageEntryPrivate {
@@ -111,28 +112,29 @@ gnome_image_entry_construct (GnomeImageEntry     *ientry,
 GtkWidget *
 gnome_image_entry_new_icon_entry (void)
 {
-	GnomeSelector *selector;
+	GNOME_Selector selector;
+	CORBA_Environment ev;
 
-	selector = g_object_new (gnome_image_entry_component_get_type (),
-				 "want_default_behaviour", TRUE,
-				 "is_pixmap_entry", FALSE, NULL);
+	CORBA_exception_init (&ev);
+	selector = bonobo_get_object ("OAFIID:GNOME_UI_Component_ImageEntry!type=icon",
+				      "GNOME/Selector", &ev);
+	CORBA_exception_free (&ev);
 
-	return gnome_image_entry_new_from_selector (BONOBO_OBJREF (selector),
-						    CORBA_OBJECT_NIL);
+	return gnome_image_entry_new_from_selector (selector, CORBA_OBJECT_NIL);
 }
 
 GtkWidget *
 gnome_image_entry_new_pixmap_entry (guint preview_x, guint preview_y)
 {
-	GnomeSelector *selector;
+	GNOME_Selector selector;
+	CORBA_Environment ev;
 
-	selector = g_object_new (gnome_image_entry_component_get_type (),
-				 "want_default_behaviour", TRUE,
-				 "preview_x", preview_x, "preview_y", preview_y,
-				 "is_pixmap_entry", TRUE, NULL);
+	CORBA_exception_init (&ev);
+	selector = bonobo_get_object ("OAFIID:GNOME_UI_Component_ImageEntry!type=pixmap",
+				      "GNOME/Selector", &ev);
+	CORBA_exception_free (&ev);
 
-	return gnome_image_entry_new_from_selector (BONOBO_OBJREF (selector),
-						    CORBA_OBJECT_NIL);
+	return gnome_image_entry_new_from_selector (selector, CORBA_OBJECT_NIL);
 }
 
 GtkWidget *
diff --git a/libgnomeui/gnome-image-selector.c b/libgnomeui/gnome-image-selector.c
index 0b6fb52..8b0b1d1 100644
--- a/libgnomeui/gnome-image-selector.c
+++ b/libgnomeui/gnome-image-selector.c
@@ -40,6 +40,7 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-icon-selector-component.h>
+#include <bonobo/bonobo-moniker-util.h>
 #include "gnome-image-selector.h"
 
 struct _GnomeImageSelectorPrivate {
@@ -111,14 +112,15 @@ gnome_image_selector_construct (GnomeImageSelector  *iselector,
 GtkWidget *
 gnome_image_selector_new (void)
 {
-	GnomeSelector *selector;
+	GNOME_Selector selector;
+	CORBA_Environment ev;
 
-	selector = g_object_new (gnome_icon_selector_component_get_type (),
-				 "want_default_behaviour", TRUE,
-				 NULL);
+	CORBA_exception_init (&ev);
+	selector = bonobo_get_object ("OAFIID:GNOME_UI_Component_IconSelector",
+				      "GNOME/Selector", &ev);
+	CORBA_exception_free (&ev);
 
-	return gnome_image_selector_new_from_selector (BONOBO_OBJREF (selector),
-						       CORBA_OBJECT_NIL);
+	return gnome_image_selector_new_from_selector (selector, CORBA_OBJECT_NIL);
 }
 
 GtkWidget *
diff --git a/libgnomeui/libgnomeui.h b/libgnomeui/libgnomeui.h
index 3ab9383..d3368da 100644
--- a/libgnomeui/libgnomeui.h
+++ b/libgnomeui/libgnomeui.h
@@ -51,7 +51,6 @@
 
 #include <libgnomeui/gnome-icon-list.h>
 #include <libgnomeui/gnome-icon-item.h>
-#include <libgnomeui/gnome-icon-selector.h>
 #include <libgnomeui/gnome-canvas-init.h>
 #include <libgnomeui/gnome-init.h>
 #include <libgnomeui/gnome-less.h>