Manually pulling back a GtkTreeViewColumn fix from treeview-refactor-staging

This fix has evolved in the staging branch since all column members are
on a private structure, but since it causes warnings when closing the
windows of the testcellarea test (because the combo-boxes use a treeviewcolumn)
I thought it nice for now to just manually include the fix.

The fix is just proper bookkeeping of delegate objects at dispose() time.
This commit is contained in:
Tristan Van Berkom 2010-12-02 17:42:46 +09:00
parent cd09abf461
commit 005964b22a

View File

@ -396,17 +396,20 @@ gtk_tree_view_column_dispose (GObject *object)
GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object; GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
if (tree_column->cell_area_context) if (tree_column->cell_area_context)
{ {
g_object_unref (tree_column->cell_area_context);
g_signal_handler_disconnect (tree_column->cell_area_context, g_signal_handler_disconnect (tree_column->cell_area_context,
tree_column->context_changed_signal); tree_column->context_changed_signal);
g_object_unref (tree_column->cell_area_context);
tree_column->cell_area_context = NULL;
tree_column->context_changed_signal = 0; tree_column->context_changed_signal = 0;
} }
if (tree_column->cell_area) if (tree_column->cell_area)
{ {
g_object_unref (tree_column->cell_area); g_object_unref (tree_column->cell_area);
tree_column->cell_area = NULL;
} }
if (tree_column->child) if (tree_column->child)