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)

diff --git a/ChangeLog b/ChangeLog
index f81f1cd0508dcb2084e83abab32690a20e30c038..c609acee5dd22b3a34dae6eeaf25d61acb7a9ab3 100644 (file)
--- 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-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprinter.c (gtk_enumerate_printers): Make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f81f1cd0508dcb2084e83abab32690a20e30c038..c609acee5dd22b3a34dae6eeaf25d61acb7a9ab3 100644 (file)
--- 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-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprinter.c (gtk_enumerate_printers): Make

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index af4738dbb9db2b218adf683e799758a1765fd93f..99ed8d0f434cd615e803b31dc3a530b1291b30a7 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2565,6 +2565,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);
@@ -2573,9 +2576,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;
 }