From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Fri, 8 Mar 2013 22:56:08 +0000 (-0500)
Subject: treeview: fix a critical warning
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=fd51c8f5e9d6fb68c8e81b9b1e2ab80931f963f0;p=~andy%2Fgtk

treeview: fix a critical warning

gtk_tree_view_column_unset_tree_view() resets column->priv->tree_view to
NULL.
The function is called when a column is removed, but later from the same
function we would call _gtk_tree_view_column_unrealize_button(), which
expects column->priv->tree_view to be != NULL, causing these critical
warnings

Gtk-CRITICAL **: gtk_widget_unregister_window: assertion
`GTK_IS_WIDGET (widget)' failed

This commit moves the call to unset the tree view after the button is
unrealized.

https://bugzilla.gnome.org/show_bug.cgi?id=695473
---

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 505f41b58..21873d775 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11965,8 +11965,6 @@ gtk_tree_view_remove_column (GtkTreeView       *tree_view,
                                         G_CALLBACK (column_sizing_notify),
                                         tree_view);
 
-  _gtk_tree_view_column_unset_tree_view (column);
-
   position = g_list_index (tree_view->priv->columns, column);
 
   tree_view->priv->columns = g_list_remove (tree_view->priv->columns, column);
@@ -11994,7 +11992,7 @@ gtk_tree_view_remove_column (GtkTreeView       *tree_view,
     }
 
   _gtk_tree_view_reset_header_styles (tree_view);
-
+  _gtk_tree_view_column_unset_tree_view (column);
   _gtk_tree_view_accessible_remove_column (tree_view, column, position);
 
   g_object_unref (column);