diff --git a/ChangeLog b/ChangeLog
index 88d2c9f9aa..4d0d1699a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_destroy): Remove the
+	scroll timeout.  (#390872, Yevgen Muntyan)
+
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkprintoperation-unix.c:
+	* gtk/gtkprintbackend.c:
+	* gtk/gtkfilechooserdefault.c:
+	* gtk/gtksettings.c: Move a few settings to gtksettings.c
+	to make sure they show up in the docs.  (#365364, Christian
+	Persch)
+
 2006-12-30  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkassistant.c: Redraw assistant on reallocate
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 74b4d6bafb..a2ba6f1bf9 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2538,6 +2538,12 @@ gtk_text_view_destroy (GtkObject *object)
   gtk_text_view_set_buffer (text_view, NULL);
   gtk_text_view_destroy_layout (text_view);
 
+  if (text_view->scroll_timeout)
+    {
+      g_source_remove (text_view->scroll_timeout);
+      text_view->scroll_timeout = 0;
+    }
+
   (* GTK_OBJECT_CLASS (gtk_text_view_parent_class)->destroy) (object);
 }