[monkey-bubble: 249/753] New function. (gnome_entry_new_from_selector): This function was formerly

[Sven Herzberg <herzi src gnome org>]

commit f34970cc09214acdbe27b4c5431cfc101795a803
Author: Martin Baulig <baulig suse de>
Date:   Tue May 1 17:03:51 2001 +0000

    New function. (gnome_entry_new_from_selector): This function was formerly
    
    2001-05-01  Martin Baulig  <baulig suse de>
    
    	* gnome-entry.h (gnome_entry_construct): New function.
    	(gnome_entry_new_from_selector): This function was formerly known
    	as gnome_entry_construct_from_selector().

 libgnomeui/ChangeLog     |    6 ++++++
 libgnomeui/gnome-entry.c |   25 ++++++++++++++++++++-----
 libgnomeui/gnome-entry.h |   19 +++++++++++--------
 3 files changed, 37 insertions(+), 13 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 29c0aac..631f154 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-01  Martin Baulig  <baulig suse de>
+
+	* gnome-entry.h (gnome_entry_construct): New function.
+	(gnome_entry_new_from_selector): This function was formerly known
+	as gnome_entry_construct_from_selector().
+
 2001-04-30  Martin Baulig  <baulig suse de>
 
 	* gnome-selector-client.[ch]: New files.
diff --git a/libgnomeui/gnome-entry.c b/libgnomeui/gnome-entry.c
index cbf1e49..e2fa2f0 100644
--- a/libgnomeui/gnome-entry.c
+++ b/libgnomeui/gnome-entry.c
@@ -113,9 +113,9 @@ gnome_entry_init (GnomeEntry *gentry)
 }
 
 GtkWidget *
-gnome_entry_construct_from_selector (GnomeEntry *gentry,
-				     GNOME_Selector corba_selector,
-				     Bonobo_UIContainer uic)
+gnome_entry_construct (GnomeEntry *gentry,
+		       GNOME_Selector corba_selector,
+		       Bonobo_UIContainer uic)
 {
 	g_return_val_if_fail (gentry != NULL, NULL);
 	g_return_val_if_fail (GNOME_IS_ENTRY (gentry), NULL);
@@ -181,10 +181,25 @@ gnome_entry_new (const gchar *history_id)
 			       G_CALLBACK (history_changed_handler),
 			       gentry, NULL, FALSE, FALSE);
 
-	return gnome_entry_construct_from_selector
-		(gentry, BONOBO_OBJREF (selector), CORBA_OBJECT_NIL);
+	return gnome_entry_construct (gentry, BONOBO_OBJREF (selector),
+				      CORBA_OBJECT_NIL);
 }
 
+GtkWidget *
+gnome_entry_new_from_selector (GNOME_Selector corba_selector,
+			       Bonobo_UIContainer uic)
+{
+	GnomeEntry *gentry;
+
+	g_return_val_if_fail (corba_selector != CORBA_OBJECT_NIL, NULL);
+
+	gentry = g_object_new (gnome_entry_get_type (), NULL);
+
+	return (GtkWidget *) gnome_selector_client_construct
+		(GNOME_SELECTOR_CLIENT (gentry), corba_selector, uic);
+}
+
+
 static void
 gnome_entry_finalize (GObject *object)
 {
diff --git a/libgnomeui/gnome-entry.h b/libgnomeui/gnome-entry.h
index eb694d9..5dd94fc 100644
--- a/libgnomeui/gnome-entry.h
+++ b/libgnomeui/gnome-entry.h
@@ -64,18 +64,21 @@ struct _GnomeEntryClass {
 };
 
 
-GtkType      gnome_entry_get_type                (void) G_GNUC_CONST;
+GtkType      gnome_entry_get_type          (void) G_GNUC_CONST;
 
-GtkWidget   *gnome_entry_new                     (const gchar        *history_id);
+GtkWidget   *gnome_entry_new               (const gchar        *history_id);
 
-GtkWidget   *gnome_entry_construct_from_selector (GnomeEntry         *gentry,
-                                                  GNOME_Selector      corba_selector,
-                                                  Bonobo_UIContainer  uic);
+GtkWidget   *gnome_entry_new_from_selector (GNOME_Selector      corba_selector,
+                                            Bonobo_UIContainer  uic);
 
-gchar       *gnome_entry_get_text                (GnomeEntry         *gentry);
+GtkWidget   *gnome_entry_construct         (GnomeEntry         *gentry,
+                                            GNOME_Selector      corba_selector,
+                                            Bonobo_UIContainer  uic);
 
-void         gnome_entry_set_text                (GnomeEntry         *gentry,
-                                                  const gchar        *text);
+gchar       *gnome_entry_get_text          (GnomeEntry         *gentry);
+
+void         gnome_entry_set_text          (GnomeEntry         *gentry,
+                                            const gchar        *text);
 
 G_END_DECLS