Mercurial > pidgin.yaz
changeset 15989:87be53a26478
merge of '437e6f11b1b4135556057db73061de861c27c862'
and 'b043ef74cd2699857810ee4e31137890a68d4462'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Wed, 04 Apr 2007 10:18:36 +0000 |
| parents | e05e5b148723 (current diff) 50d949d6bda2 (diff) |
| children | 37d928a6579e |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Apr 04 08:33:50 2007 +0000 +++ b/pidgin/gtkconv.c Wed Apr 04 10:18:36 2007 +0000 @@ -3105,8 +3105,13 @@ static gboolean typing_animation(gpointer data) { PidginConversation *gtkconv = data; + PidginWindow *gtkwin = gtkconv->win; const char *stock_id = NULL; - PidginWindow *gtkwin = gtkconv->win; + + if(gtkconv != pidgin_conv_window_get_active_gtkconv(gtkwin)) { + return FALSE; + } + switch (rand() % 5) { case 0: stock_id = PIDGIN_STOCK_ANIMATION_TYPING0;