Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/switchboard.c @ 29653:d855ff9cf839
propagate from branch 'im.pidgin.pidgin' (head 311b4db51b575e1baa7f78d751ff926475edecc3)
to branch 'im.pidgin.cpw.attention_ui' (head 97b1a4ad4476369802e26e6ddf7aec5a5e46dc00)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 13 Nov 2008 19:49:58 +0000 |
| parents | 9b253ce969d0 22b8a92fb5ee |
| children | 558baf33197e |
comparison
equal
deleted
inserted
replaced
| 24347:f18f37a62971 | 29653:d855ff9cf839 |
|---|---|
| 1029 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) | 1029 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
| 1030 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); | 1030 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); |
| 1031 | 1031 |
| 1032 else | 1032 else |
| 1033 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); | 1033 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); |
| 1034 | |
| 1035 purple_conversation_attention(swboard->conv, user, 0, | |
| 1036 PURPLE_MESSAGE_RECV, time(NULL)); | |
| 1034 | 1037 |
| 1035 } else if (!strcmp(id, "2")) { | 1038 } else if (!strcmp(id, "2")) { |
| 1036 /* Wink */ | 1039 /* Wink */ |
| 1037 | 1040 |
| 1038 } else if (!strcmp(id, "3")) { | 1041 } else if (!strcmp(id, "3")) { |