# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1175681916 0
# Node ID 87be53a26478a7f38b7682846a462423903a91df
# Parent  e05e5b1487232fd54434722093c3115a079fd319# Parent  50d949d6bda27ffe337df93bbf13c3021be5fb1e
merge of '437e6f11b1b4135556057db73061de861c27c862'
     and 'b043ef74cd2699857810ee4e31137890a68d4462'

diff -r e05e5b148723 -r 87be53a26478 pidgin/gtkconv.c
--- 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;