summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-12-31 06:00:08 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-12-31 06:00:08 +0000
commitea7282091162e6d8dd460e00161bf8ac63edd354 (patch)
tree043f9e345e358da45c1d62d622cb3f8dc8333b9c
parent7979cd6ac71a04e2b72bff7c00da261c49476c43 (diff)
downloadgtk+-ea7282091162e6d8dd460e00161bf8ac63edd354.tar.gz
Remove the scroll timeout. (#390872, Yevgen Muntyan)
2006-12-30 Matthias Clasen <mclasen@redhat.com> * gtk/gtktextview.c (gtk_text_view_destroy): Remove the scroll timeout. (#390872, Yevgen Muntyan) svn path=/trunk/; revision=16993
-rw-r--r--ChangeLog14
-rw-r--r--gtk/gtktextview.c6
2 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e35a45c88..a7288daf5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
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
to avoid rendering glitches. (#343956, Christian
Persch, Carlos Garnacho)
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index cf393ea086..3bac02a595 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2552,6 +2552,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);
}