Remove validate_rows_timer in unrealize. Reported by Matthew Wilson.

Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
	validate_rows_timer in unrealize.  Reported by Matthew Wilson.

diff --git a/ChangeLog b/ChangeLog
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 02f0de5c4b7823cc961354c89dcc022ee8d59e75..1b4cb5256a29452ffbcbac9c67639d8e0571b570 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 12 16:43:10 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_unrealize): Remove
+       validate_rows_timer in unrealize.  Reported by Matthew Wilson.
+
 Wed Dec 12 16:18:26 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_realize): Remove support for

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b222d48121f8b92dc50257881885124be13c62cb..e34f3d93461b5f22e0c21f72e195f16edfadcf01 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1325,6 +1325,12 @@ gtk_tree_view_unrealize (GtkWidget *widget)
       tree_view->priv->presize_handler_timer = 0;
     }
 
+  if (tree_view->priv->validate_rows_timer != 0)
+    {
+      gtk_timeout_remove (tree_view->priv->validate_rows_timer);
+      tree_view->priv->validate_rows_timer = 0;
+    }
+
   for (list = tree_view->priv->columns; list; list = list->next)
     _gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));