# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1185730740 0
# Node ID a9142edf5b654579a8360c08fa4872a5899af966
# Parent  0d75d0bd2f84c82aa92de6ac25167c172aea320f
And fix smooth scroll too

diff -r 0d75d0bd2f84 -r a9142edf5b65 pidgin/gtkimhtml.c
--- 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);	
 }