diff libpurple/conversation.c @ 29293:42c64c41cf87

propagate from branch 'im.pidgin.pidgin' (head 46523386d682c917679b3de662d51a5bda0da46b) to branch 'im.pidgin.cpw.attention_ui' (head 39d8ac60b05e7766f90db850144c9e963076cec9)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 08 Jun 2009 18:28:31 +0000
parents b2b1fa27047a 2ab648c328cc
children 8b17877d3294
line wrap: on
line diff
--- a/libpurple/conversation.c	Mon May 25 19:27:33 2009 +0000
+++ b/libpurple/conversation.c	Mon Jun 08 18:28:31 2009 +0000
@@ -55,7 +55,6 @@
 	im = PURPLE_CONV_IM(c);
 
 	purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
-	purple_conv_im_update_typing(im);
 	purple_conv_im_stop_typing_timeout(im);
 
 	return FALSE;
@@ -1060,6 +1059,8 @@
 								   "buddy-typing-stopped", im->conv->account, im->conv->name);
 				break;
 		}
+
+		purple_conv_im_update_typing(im);
 	}
 }