summaryrefslogtreecommitdiff
path: root/gtk/gtktreeview.c
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2006-06-27 09:28:48 +0000
committerKristian Rietveld <kristian@src.gnome.org>2006-06-27 09:28:48 +0000
commit542ac19eef22cfeacf1c5363ce061ac2f9854f61 (patch)
tree9c2a6a2ab2cb5079bb2a37948edeb8cfc6b60539 /gtk/gtktreeview.c
parentfda2e9201fb37496d044d74cf78a76457600529e (diff)
downloadgtk+-542ac19eef22cfeacf1c5363ce061ac2f9854f61.tar.gz
cancel the expand collapse timeout when unsetting the model (Fixes
2006-06-27 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the expand collapse timeout when unsetting the model (Fixes #327164, reported by Daichi Kawahata).
Diffstat (limited to 'gtk/gtktreeview.c')
-rw-r--r--gtk/gtktreeview.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index cf4be7fce0..c8c3e49a37 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10399,6 +10399,12 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
gtk_tree_view_stop_editing (tree_view, TRUE);
+ if (tree_view->priv->expand_collapse_timeout)
+ {
+ g_source_remove (tree_view->priv->expand_collapse_timeout);
+ tree_view->priv->expand_collapse_timeout = 0;
+ }
+
g_signal_handlers_disconnect_by_func (tree_view->priv->model,
gtk_tree_view_row_changed,
tree_view);