changeset 18736:a9142edf5b65

And fix smooth scroll too
author Sean Egan <seanegan@gmail.com>
date Sun, 29 Jul 2007 17:39:00 +0000
parents 0d75d0bd2f84
children 3f965b7c7ffa
files pidgin/gtkimhtml.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c	Sun Jul 29 17:09:32 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sun Jul 29 17:39:00 2007 +0000
@@ -386,7 +386,9 @@
 
 	imhtml->old_rect = rect;
 	parent_size_allocate(widget, alloc);
-	if (scroll)
+	
+	/* Don't scroll here if we're in the middle of a smooth scroll */
+	if (scroll && imhtml->scroll_time == NULL)
 		gtk_imhtml_scroll_to_end(imhtml, FALSE);	
 }