Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 18020:3c4811489e30
propagate from branch 'im.pidgin.rlaager.merging.for_2_1_0' (head 24ee3feb7b0e68036eebb50b90278e581fea942a)
to branch 'im.pidgin.pidgin.2.1.0' (head 996b7212bd0ff741b6d317a46490f9e903bd624d)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 28 May 2007 08:06:28 +0000 |
| parents | 1e674c0886b1 1c62deca5958 |
| children | 92e27556160c |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun May 20 18:40:58 2007 +0000 +++ b/pidgin/gtkconv.c Mon May 28 08:06:28 2007 +0000 @@ -3180,7 +3180,7 @@ stock_id = PIDGIN_STOCK_ANIMATION_TYPING1; tooltip = _("User is typing..."); } else { - stock_id = PIDGIN_STOCK_ANIMATION_TYPING0; + stock_id = PIDGIN_STOCK_ANIMATION_TYPING5; tooltip = _("User has typed something and stopped"); g_source_remove(gtkconv->u.im->typing_timer); gtkconv->u.im->typing_timer = 0; @@ -7714,6 +7714,11 @@ gtkconv = PIDGIN_CONVERSATION(conv); + if (gtkconv->u.im->typing_timer != 0) { + g_source_remove(gtkconv->u.im->typing_timer); + gtkconv->u.im->typing_timer = 0; + } + stop_anim(NULL, gtkconv); } static void