changeset 31236:06791ebf7681

applied changes from 471aa5f04627823959bd9accda5d5e5630f119d5 through f15ef8aec853f0c996199d27a4497b4c90a118ec
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 21 Feb 2011 01:18:49 +0000
parents c0945d2291b9
children 167ea4b4765c
files libpurple/conversation.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/conversation.c	Mon Feb 21 00:19:45 2011 +0000
+++ b/libpurple/conversation.c	Mon Feb 21 01:18:49 2011 +0000
@@ -1218,15 +1218,15 @@
 
 	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)