Mercurial > pidgin.yaz
comparison libpurple/protocols/yahoo/libymsg.c @ 29689:42360009f2e5
propagate from branch 'im.pidgin.pidgin' (head 6836b6429243a0b1f36354530521dda81b509fb5)
to branch 'im.pidgin.cpw.attention_ui' (head fef03d6a94e8ed3398f8e3590ad8fca7916e2a32)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 06 Jul 2009 17:40:06 +0000 |
| parents | 09772222714a |
| children | 15cde23b43bc |
comparison
equal
deleted
inserted
replaced
| 27469:ca66c299dbbf | 29689:42360009f2e5 |
|---|---|
| 1069 if (c == NULL) { | 1069 if (c == NULL) { |
| 1070 c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, from); | 1070 c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, from); |
| 1071 } | 1071 } |
| 1072 username = g_markup_escape_text(from, -1); | 1072 username = g_markup_escape_text(from, -1); |
| 1073 purple_prpl_got_attention(gc, username, YAHOO_BUZZ); | 1073 purple_prpl_got_attention(gc, username, YAHOO_BUZZ); |
| 1074 purple_conversation_attention(c, username, 0, PURPLE_MESSAGE_RECV, | |
| 1075 time(NULL)); | |
| 1074 g_free(username); | 1076 g_free(username); |
| 1075 g_free(m); | 1077 g_free(m); |
| 1076 g_free(im); | 1078 g_free(im); |
| 1077 g_free(msn_from); | 1079 g_free(msn_from); |
| 1078 continue; | 1080 continue; |
| 4844 | 4846 |
| 4845 if (*args && args[0]) | 4847 if (*args && args[0]) |
| 4846 return PURPLE_CMD_RET_FAILED; | 4848 return PURPLE_CMD_RET_FAILED; |
| 4847 | 4849 |
| 4848 purple_prpl_send_attention(account->gc, c->name, YAHOO_BUZZ); | 4850 purple_prpl_send_attention(account->gc, c->name, YAHOO_BUZZ); |
| 4851 purple_conversation_attention(c, c->name, 0, PURPLE_MESSAGE_SEND, time(NULL)); | |
| 4849 | 4852 |
| 4850 return PURPLE_CMD_RET_OK; | 4853 return PURPLE_CMD_RET_OK; |
| 4851 } | 4854 } |
| 4852 | 4855 |
| 4853 PurpleCmdRet | 4856 PurpleCmdRet |