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).
This commit is contained in:
Kristian Rietveld 2006-06-27 09:28:48 +00:00 committed by Kristian Rietveld
parent fda2e9201f
commit 542ac19eef
3 changed files with 18 additions and 0 deletions

View File

@ -1,3 +1,9 @@
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).
2006-06-26 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24

View File

@ -1,3 +1,9 @@
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).
2006-06-26 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24

View File

@ -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);