summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Pablo Ugarte <jpu@src.gnome.org>2006-09-08 16:39:32 +0000
committerJuan Pablo Ugarte <jpu@src.gnome.org>2006-09-08 16:39:32 +0000
commit2ce1bd64c0992cb7e44fbb0361644a3a6da37b82 (patch)
treeb8ccbf4751df64db06d2fd0e01b67bc68dd4e62f
parent35aaba25562a7eaa0ddb849fe0ee2e3401a7785b (diff)
downloadglade-2ce1bd64c0992cb7e44fbb0361644a3a6da37b82.tar.gz
added glade_gtk_combo_box_entry_get_internal_child() Fixed bug 354716
* src/glade-gtk.c: added glade_gtk_combo_box_entry_get_internal_child() Fixed bug 354716 "cut&paste ComboBoxEntry crashes Glade" * widgets/gtk+.xml.in: added GtkComboBoxEntry's get-internal-child-function.
-rw-r--r--ChangeLog10
-rw-r--r--src/glade-gtk.c12
-rw-r--r--widgets/gtk+.xml.in1
3 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 07af0fac..d6846eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2006-08-17 Tristan Van Berkom <tvb@gnome.org>
+2006-09-08 Juan Pablo Ugarte <juanpablougarte@gmail.com>
+
+ * src/glade-gtk.c: added glade_gtk_combo_box_entry_get_internal_child()
+ Fixed bug 354716 "cut&paste ComboBoxEntry crashes Glade"
+
+ * widgets/gtk+.xml.in: added GtkComboBoxEntry's
+ get-internal-child-function.
+
+2006-09-06 Tristan Van Berkom <tvb@gnome.org>
* src/glade-command.c: Backing out multiple consecutive pastes from 3.0,
reopening bug 345603.
diff --git a/src/glade-gtk.c b/src/glade-gtk.c
index 074e133d..fb4ee4e8 100644
--- a/src/glade-gtk.c
+++ b/src/glade-gtk.c
@@ -4859,6 +4859,18 @@ glade_gtk_combo_box_entry_post_create (GObject *object, GladeCreateReason reason
"entry", "comboboxentry", FALSE, reason);
}
+void GLADEGTK_API
+glade_gtk_combo_box_entry_get_internal_child (GObject *object,
+ const gchar *name,
+ GObject **child)
+{
+ g_return_if_fail (GTK_IS_COMBO_BOX_ENTRY (object));
+
+ if (strcmp ("entry", name) == 0)
+ *child = G_OBJECT (gtk_bin_get_child (GTK_BIN (object)));
+ else
+ *child = NULL;
+}
/* ----------------------------- GtkOptionMenu ------------------------------ */
void GLADEGTK_API
diff --git a/widgets/gtk+.xml.in b/widgets/gtk+.xml.in
index 3e3fde87..fcde1aa7 100644
--- a/widgets/gtk+.xml.in
+++ b/widgets/gtk+.xml.in
@@ -668,6 +668,7 @@
<glade-widget-class name="GtkComboBoxEntry" generic-name="comboboxentry" _title="Combo Box Entry">
<post-create-function>glade_gtk_combo_box_entry_post_create</post-create-function>
+ <get-internal-child-function>glade_gtk_combo_box_entry_get_internal_child</get-internal-child-function>
</glade-widget-class>
<glade-widget-class name="GtkTreeView" generic-name="treeview" _title="Tree View">