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

diff --git a/ChangeLog b/ChangeLog
index a18aa798aa4642068ca38a3c4bc23e2c68fda78d..435fabf7d39aaff7d003c953e2ede609f2e9870e 100644 (file)
--- 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 347314d917161ae0a1ee55b344667aefde09b5b3..3aef2bc0325fda39622c079d42743bd3e47327d7 100644 (file)
--- 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);