Mercurial > pidgin
changeset 18737:3f965b7c7ffa
merge of '966f1125e1910ec58ae63a175dc5efe1fd3e10e0'
and 'c2cc31f23a71f23062555721f8101fc9c997bae2'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 29 Jul 2007 21:12:17 +0000 |
| parents | a9142edf5b65 (diff) c65c4caa817a (current diff) |
| children | 2cfb6ef9ab73 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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