Mercurial > pidgin
changeset 18738:2cfb6ef9ab73
merge of '10d1346d5d54ad467669dbdbeda58088587c5d91'
and '212fdd25c609bad4012e9d24867ba7d9ed6a9998'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 29 Jul 2007 21:29:10 +0000 |
| parents | 3f965b7c7ffa (diff) bf8b69cba9ae (current diff) |
| children | f29794be0163 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Sun Jul 29 21:29:04 2007 +0000 +++ b/pidgin/gtkimhtml.c Sun Jul 29 21:29:10 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