Mercurial > pidgin.yaz
comparison libpurple/protocols/yahoo/libymsg.c @ 29697:40b523845a6e
propagate from branch 'im.pidgin.pidgin' (head 8c322571bfb4f2d00c9126e59746445f877be296)
to branch 'im.pidgin.cpw.attention_ui' (head f2b8ccc32a73cb137e1a4f3fd5fb55266df2feed)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 03 Nov 2009 18:27:22 +0000 |
| parents | 99b9c9ee7363 168fcd171875 |
| children | 9bc902d88fa2 |
comparison
equal
deleted
inserted
replaced
| 28865:28d73d34d792 | 29697:40b523845a6e |
|---|---|
| 1118 if (!strcmp(m, "<ding>")) { | 1118 if (!strcmp(m, "<ding>")) { |
| 1119 char *username; | 1119 char *username; |
| 1120 | 1120 |
| 1121 username = g_markup_escape_text(im->fed_from, -1); | 1121 username = g_markup_escape_text(im->fed_from, -1); |
| 1122 purple_prpl_got_attention(gc, username, YAHOO_BUZZ); | 1122 purple_prpl_got_attention(gc, username, YAHOO_BUZZ); |
| 1123 purple_conversation_attention(c, username, 0, PURPLE_MESSAGE_RECV, | |
| 1124 time(NULL)); | |
| 1123 g_free(username); | 1125 g_free(username); |
| 1124 g_free(m); | 1126 g_free(m); |
| 1125 g_free(im->fed_from); | 1127 g_free(im->fed_from); |
| 1126 g_free(im); | 1128 g_free(im); |
| 1127 continue; | 1129 continue; |
| 5043 | 5045 |
| 5044 if (*args && args[0]) | 5046 if (*args && args[0]) |
| 5045 return PURPLE_CMD_RET_FAILED; | 5047 return PURPLE_CMD_RET_FAILED; |
| 5046 | 5048 |
| 5047 purple_prpl_send_attention(account->gc, c->name, YAHOO_BUZZ); | 5049 purple_prpl_send_attention(account->gc, c->name, YAHOO_BUZZ); |
| 5050 purple_conversation_attention(c, c->name, 0, PURPLE_MESSAGE_SEND, time(NULL)); | |
| 5048 | 5051 |
| 5049 return PURPLE_CMD_RET_OK; | 5052 return PURPLE_CMD_RET_OK; |
| 5050 } | 5053 } |
| 5051 | 5054 |
| 5052 PurpleCmdRet | 5055 PurpleCmdRet |