# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1185743537 0
# Node ID 3f965b7c7ffa30e1b103142f40f6bde163894df6
# Parent  a9142edf5b654579a8360c08fa4872a5899af966# Parent  c65c4caa817abfa7b488921e4b10dc9926695df7
merge of '966f1125e1910ec58ae63a175dc5efe1fd3e10e0'
     and 'c2cc31f23a71f23062555721f8101fc9c997bae2'

diff -r c65c4caa817a -r 3f965b7c7ffa pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Sun Jul 29 07:01:13 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sun Jul 29 21:12:17 2007 +0000
@@ -386,7 +386,10 @@
 
 	imhtml->old_rect = rect;
 	parent_size_allocate(widget, alloc);
-	gtk_imhtml_scroll_to_end(imhtml, FALSE);	
+	
+	/* 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);	
 }
 
 static gint