Mercurial > pidgin
comparison libpurple/protocols/msn/msg.c @ 29271:385473abc18b
Merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 06 Feb 2009 23:27:45 +0000 |
parents | e841bad196e0 |
children |
comparison
equal
deleted
inserted
replaced
29270:e841bad196e0 | 29271:385473abc18b |
---|---|
954 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); | 954 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); |
955 | 955 |
956 else | 956 else |
957 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); | 957 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); |
958 | 958 |
959 purple_conversation_attention(swboard->conv, user, MSN_NUDGE, | |
960 PURPLE_MESSAGE_SEND, time(NULL)); | |
961 } else { | 959 } else { |
962 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); | 960 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); |
963 } | 961 } |
962 | |
964 } else if (!strcmp(id, "2")) { | 963 } else if (!strcmp(id, "2")) { |
965 /* Wink */ | 964 /* Wink */ |
966 | 965 |
967 } else if (!strcmp(id, "3")) { | 966 } else if (!strcmp(id, "3")) { |
968 /* Voiceclip */ | 967 /* Voiceclip */ |