Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/switchboard.c @ 29658:a0fd6a41d127
propagate from branch 'im.pidgin.pidgin' (head 1203a733696f95eef53b04b5078e0a779371b4d3)
to branch 'im.pidgin.cpw.attention_ui' (head 37530586a02ebf04f4d6002ba9e30f0ff49eb527)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 07 Dec 2008 01:37:06 +0000 |
| parents | 15db3067a5ac 558baf33197e |
| children | e841bad196e0 |
comparison
equal
deleted
inserted
replaced
| 24604:918738a0bba4 | 29658:a0fd6a41d127 |
|---|---|
| 1036 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) | 1036 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
| 1037 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); | 1037 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); |
| 1038 | 1038 |
| 1039 else | 1039 else |
| 1040 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); | 1040 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); |
| 1041 | |
| 1042 purple_conversation_attention(swboard->conv, user, 0, | |
| 1043 PURPLE_MESSAGE_RECV, time(NULL)); | |
| 1041 | 1044 |
| 1042 } else if (!strcmp(id, "2")) { | 1045 } else if (!strcmp(id, "2")) { |
| 1043 /* Wink */ | 1046 /* Wink */ |
| 1044 | 1047 |
| 1045 } else if (!strcmp(id, "3")) { | 1048 } else if (!strcmp(id, "3")) { |