Mercurial > pidgin
comparison libpurple/conversation.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 26 Sep 2010 20:16:15 +0000 |
parents | 351d07aefb09 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
30577:7b761c8601f7 | 30578:0accc8adb18a |
---|---|
1122 | 1122 |
1123 void | 1123 void |
1124 purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout) | 1124 purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout) |
1125 { | 1125 { |
1126 PurpleConversation *conv; | 1126 PurpleConversation *conv; |
1127 const char *name; | |
1128 | 1127 |
1129 g_return_if_fail(im != NULL); | 1128 g_return_if_fail(im != NULL); |
1130 | 1129 |
1131 if (im->typing_timeout > 0) | 1130 if (im->typing_timeout > 0) |
1132 purple_conv_im_stop_typing_timeout(im); | 1131 purple_conv_im_stop_typing_timeout(im); |
1133 | 1132 |
1134 conv = purple_conv_im_get_conversation(im); | 1133 conv = purple_conv_im_get_conversation(im); |
1135 name = purple_conversation_get_name(conv); | |
1136 | 1134 |
1137 im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv); | 1135 im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv); |
1138 } | 1136 } |
1139 | 1137 |
1140 void | 1138 void |
1518 PurpleMessageFlags flags, time_t mtime) | 1516 PurpleMessageFlags flags, time_t mtime) |
1519 { | 1517 { |
1520 PurpleAccount *account; | 1518 PurpleAccount *account; |
1521 PurpleConversation *conv; | 1519 PurpleConversation *conv; |
1522 PurpleConnection *gc; | 1520 PurpleConnection *gc; |
1523 PurplePluginProtocolInfo *prpl_info; | |
1524 | 1521 |
1525 g_return_if_fail(chat != NULL); | 1522 g_return_if_fail(chat != NULL); |
1526 g_return_if_fail(who != NULL); | 1523 g_return_if_fail(who != NULL); |
1527 g_return_if_fail(message != NULL); | 1524 g_return_if_fail(message != NULL); |
1528 | 1525 |
1529 conv = purple_conv_chat_get_conversation(chat); | 1526 conv = purple_conv_chat_get_conversation(chat); |
1530 gc = purple_conversation_get_gc(conv); | 1527 gc = purple_conversation_get_gc(conv); |
1531 account = purple_connection_get_account(gc); | 1528 account = purple_connection_get_account(gc); |
1532 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); | |
1533 | 1529 |
1534 /* Don't display this if the person who wrote it is ignored. */ | 1530 /* Don't display this if the person who wrote it is ignored. */ |
1535 if (purple_conv_chat_is_user_ignored(chat, who)) | 1531 if (purple_conv_chat_is_user_ignored(chat, who)) |
1536 return; | 1532 return; |
1537 | 1533 |