# HG changeset patch # User Evan Schoenberg # Date 1298251129 0 # Node ID 06791ebf7681f95d8c2e335423feea089add6333 # Parent c0945d2291b9535ac2a09ac5f1b49e60a5eb9abc applied changes from 471aa5f04627823959bd9accda5d5e5630f119d5 through f15ef8aec853f0c996199d27a4497b4c90a118ec diff -r c0945d2291b9 -r 06791ebf7681 libpurple/conversation.c --- 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)