summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Rietveld <kris@imendio.com>2007-06-06 08:54:30 +0000
committerKristian Rietveld <kristian@src.gnome.org>2007-06-06 08:54:30 +0000
commit1598526f5cabde67125b7867a062eeca599a5a84 (patch)
tree8a7b4152ad592db4cabb3081fc790a4c319c60ac
parentfb6a0314fded42ceee0b85d590b224703704c00e (diff)
downloadgdk-pixbuf-1598526f5cabde67125b7867a062eeca599a5a84.tar.gz
also remove the auto expand timeout if it exists.
2007-06-06 Kristian Rietveld <kris@imendio.com> * gtk/gtktreeview.c (gtk_tree_view_unrealize): also remove the auto expand timeout if it exists. svn path=/trunk/; revision=18048
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtktreeview.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a18aa798a..435fabf7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-06 Kristian Rietveld <kris@imendio.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_unrealize): also remove the
+ auto expand timeout if it exists.
+
2007-06-06 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkevents-quartz.c (synthesize_crossing_events):
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 347314d91..3aef2bc03 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1809,6 +1809,12 @@ gtk_tree_view_unrealize (GtkWidget *widget)
priv->scroll_timeout = 0;
}
+ if (priv->auto_expand_timeout != 0)
+ {
+ g_source_remove (priv->auto_expand_timeout);
+ priv->auto_expand_timeout = 0;
+ }
+
if (priv->open_dest_timeout != 0)
{
g_source_remove (priv->open_dest_timeout);