From 2b6c3b4dcbf73b9846a8d67868244876660d54be Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 11 Dec 2001 00:45:25 +0000 Subject: [PATCH] stupid bug where I didn't reset the timer. Mon Dec 10 19:42:29 2001 Jonathan Blandford * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I didn't reset the timer. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 12 ++++++------ 8 files changed, 41 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 02fc60a6d8..ac7e08e437 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Dec 10 19:42:29 2001 Jonathan Blandford + + * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I + didn't reset the timer. + 2001-12-10 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_child_type): Close comment. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index c1e27f0e43..f28d580f76 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -3154,9 +3154,6 @@ validate_row (GtkTreeView *tree_view, if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) && !column->dirty) continue; - if (column->column_type == GTK_TREE_VIEW_COLUMN_FIXED) - continue; - gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter, GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT), node->children?TRUE:FALSE); @@ -3315,7 +3312,10 @@ validate_rows_handler (GtkTreeView *tree_view) GDK_THREADS_ENTER (); if (tree_view->priv->tree == NULL) - return FALSE; + { + tree_view->priv->validate_rows_timer = 0; + return FALSE; + } do { @@ -4819,9 +4819,9 @@ gtk_tree_view_row_changed (GtkTreeModel *model, gtk_tree_view_column_cell_set_dirty (column); } } - install_presize_handler (tree_view); done: + install_presize_handler (tree_view); if (free_path) gtk_tree_path_free (path); } @@ -4911,9 +4911,9 @@ gtk_tree_view_row_inserted (GtkTreeModel *model, tmpnode = _gtk_rbtree_find_count (tree, indices[depth - 1]); _gtk_rbtree_insert_after (tree, tmpnode, 0, FALSE); } - install_presize_handler (tree_view); done: + install_presize_handler (tree_view); if (free_path) gtk_tree_path_free (path); }