pidgin: e7c103fd: applied changes from 471aa5f04627823959b...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: e7c103fdfbc59bb2ca41a3c8813c4ff2847a673f
Parent:   7ee5e1d431651ed2b1a54bc942d63f35580af55c
Author:   evands at pidgin.im
Date:     02/20/11 20:18:49
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e7c103fdfbc59bb2ca41a3c8813c4ff2847a673f

Changelog: 

applied changes from 471aa5f04627823959bd9accda5d5e5630f119d5
             through f15ef8aec853f0c996199d27a4497b4c90a118ec

Changes against parent 7ee5e1d431651ed2b1a54bc942d63f35580af55c

  patched  libpurple/conversation.c

-------------- next part --------------
============================================================
--- libpurple/conversation.c	a065e8a8285ea67cbc9b7e8595074e4922ad2226
+++ libpurple/conversation.c	1e4130c65439d1928df571ffc54d8c37b384e3ac
@@ -1218,15 +1218,15 @@ purple_conv_im_write(PurpleConvIm *im, c
 
 	c = purple_conv_im_get_conversation(im);
 
+    if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) {
+		purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
+	}
+
 	/* Pass this on to either the ops structure or the default write func. */
 	if (c->ui_ops != NULL && c->ui_ops->write_im != NULL)
 		c->ui_ops->write_im(c, who, message, flags, mtime);
 	else
 		purple_conversation_write(c, who, message, flags, mtime);
-
-	if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) {
-		purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
-	}
 }
 
 gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what)