summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-06-26 10:27:24 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-06-26 10:27:24 +0000
commit9ced3731a1d025129ca6d1273d7e5a57fe7382c7 (patch)
tree7ab0c04d687d15ef769d6e6d6a9bb8c803d1ed9d
parent4dc4d89ddef0b0136b692f72e4f67ecd4189f3de (diff)
downloadgdk-pixbuf-9ced3731a1d025129ca6d1273d7e5a57fe7382c7.tar.gz
Avoid a refcounting leak in the python bindings. (#344876, Phil Dumont)
2006-06-26 Matthias Clasen <mclasen@redhat.com> * gtk/gtkcombobox.c (gtk_cell_view_menu_item_new): Avoid a refcounting leak in the python bindings. (#344876, Phil Dumont)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtkcombobox.c6
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 585b44017..7b60e38a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-26 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkcombobox.c (gtk_cell_view_menu_item_new): Avoid
+ a refcounting leak in the python bindings. (#344876, Phil Dumont)
+
2006-06-18 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump the atk requirement to 1.9.0
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 585b44017..7b60e38a8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-06-26 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkcombobox.c (gtk_cell_view_menu_item_new): Avoid
+ a refcounting leak in the python bindings. (#344876, Phil Dumont)
+
2006-06-18 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump the atk requirement to 1.9.0
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 5e0ae507f..304f8aa4f 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2497,6 +2497,9 @@ gtk_cell_view_menu_item_new (GtkComboBox *combo_box,
GtkRequisition req;
cell_view = gtk_cell_view_new ();
+ item = gtk_menu_item_new ();
+ gtk_container_add (GTK_CONTAINER (item), cell_view);
+
gtk_cell_view_set_model (GTK_CELL_VIEW (cell_view), model);
path = gtk_tree_model_get_path (model, iter);
gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (cell_view), path);
@@ -2505,9 +2508,6 @@ gtk_cell_view_menu_item_new (GtkComboBox *combo_box,
gtk_combo_box_sync_cells (combo_box, GTK_CELL_LAYOUT (cell_view));
gtk_widget_size_request (cell_view, &req);
gtk_widget_show (cell_view);
-
- item = gtk_menu_item_new ();
- gtk_container_add (GTK_CONTAINER (item), cell_view);
return item;
}