From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 14 Aug 2006 20:12:10 +0000 (+0000)
Subject: Null the cell_view pointer if the internal cell view is removed. (#348828,
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=1c1a3a7c414da5c1bb0b6574fb1c3a37eadb4dcb

Null the cell_view pointer if the internal cell view is removed. (#348828,

2006-08-14  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_remove): Null the
	cell_view pointer if the internal cell view is removed.
	(#348828, Rolando Espinoza La Fuente)
---

diff --git a/ChangeLog b/ChangeLog
index 5fd7c91d0..7b6d3da39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-14  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_remove): Null the
+	cell_view pointer if the internal cell view is removed. 
+	(#348828, Rolando Espinoza La Fuente)
+
 	* gtk/gtkentry.c (gtk_entry_drag_data_received): Don't leak
 	in the non-editable case.  (#350258, Colin Leroy)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5fd7c91d0..7b6d3da39 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-08-14  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_remove): Null the
+	cell_view pointer if the internal cell view is removed. 
+	(#348828, Rolando Espinoza La Fuente)
+
 	* gtk/gtkentry.c (gtk_entry_drag_data_received): Don't leak
 	in the non-editable case.  (#350258, Colin Leroy)
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 17ad9e998..0b14e41e6 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1011,6 +1011,9 @@ gtk_combo_box_remove (GtkContainer *container,
   GtkTreePath *path;
   gboolean appears_as_list;
 
+  if (widget == combo_box->priv->cell_view)
+    combo_box->priv->cell_view = NULL;
+
   gtk_widget_unparent (widget);
   GTK_BIN (container)->child = NULL;