From a2dcca137ddf44318d3aa80168050db8d8230d6c Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Fri, 5 Jan 2007 21:37:41 +0000 Subject: [PATCH] Merge from HEAD. 2007-01-05 Kristian Rietveld Merge from HEAD. * gtk/gtktreeview.c (gtk_tree_view_row_changed): do allow to invalidate nodes if the tree view is not realized. (#363147, Carlos Garnacho, Miguel Cabrera). svn path=/branches/gtk-2-10/; revision=17090 --- ChangeLog | 8 ++++++++ gtk/gtktreeview.c | 10 +++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd55838a72..f0ea3752b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-05 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtktreeview.c (gtk_tree_view_row_changed): do allow to + invalidate nodes if the tree view is not realized. (#363147, + Carlos Garnacho, Miguel Cabrera). + 2007-01-05 Matthias Clasen * configure.in: Bump version diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 35a880d84b..33be1109e4 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8069,11 +8069,6 @@ gtk_tree_view_row_changed (GtkTreeModel *model, g_return_if_fail (path != NULL || iter != NULL); - if (!GTK_WIDGET_REALIZED (tree_view)) - /* We can just ignore ::changed signals if we aren't realized, as we don't care about sizes - */ - return; - if (tree_view->priv->cursor != NULL) cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor); else @@ -8110,7 +8105,8 @@ gtk_tree_view_row_changed (GtkTreeModel *model, && tree_view->priv->fixed_height >= 0) { _gtk_rbtree_node_set_height (tree, node, tree_view->priv->fixed_height); - gtk_tree_view_node_queue_redraw (tree_view, tree, node); + if (GTK_WIDGET_REALIZED (tree_view)) + gtk_tree_view_node_queue_redraw (tree_view, tree, node); } else { @@ -8131,7 +8127,7 @@ gtk_tree_view_row_changed (GtkTreeModel *model, } done: - if (!tree_view->priv->fixed_height_mode) + if (GTK_WIDGET_REALIZED (tree_view) && !tree_view->priv->fixed_height_mode) install_presize_handler (tree_view); if (free_path) gtk_tree_path_free (path);