Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 31685: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 | 6342df9934cb 65999cb4fc40 |
comparison
equal
deleted
inserted
replaced
31684:c0945d2291b9 | 31685:06791ebf7681 |
---|---|
1216 g_return_if_fail(im != NULL); | 1216 g_return_if_fail(im != NULL); |
1217 g_return_if_fail(message != NULL); | 1217 g_return_if_fail(message != NULL); |
1218 | 1218 |
1219 c = purple_conv_im_get_conversation(im); | 1219 c = purple_conv_im_get_conversation(im); |
1220 | 1220 |
1221 if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) { | |
1222 purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING); | |
1223 } | |
1224 | |
1221 /* Pass this on to either the ops structure or the default write func. */ | 1225 /* Pass this on to either the ops structure or the default write func. */ |
1222 if (c->ui_ops != NULL && c->ui_ops->write_im != NULL) | 1226 if (c->ui_ops != NULL && c->ui_ops->write_im != NULL) |
1223 c->ui_ops->write_im(c, who, message, flags, mtime); | 1227 c->ui_ops->write_im(c, who, message, flags, mtime); |
1224 else | 1228 else |
1225 purple_conversation_write(c, who, message, flags, mtime); | 1229 purple_conversation_write(c, who, message, flags, mtime); |
1226 | |
1227 if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) { | |
1228 purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING); | |
1229 } | |
1230 } | 1230 } |
1231 | 1231 |
1232 gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what) | 1232 gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what) |
1233 { | 1233 { |
1234 PurpleConversation *conv; | 1234 PurpleConversation *conv; |