Mercurial > pidgin
comparison libpurple/protocols/msn/switchboard.c @ 23572:2eefa8dc7481
Properly send MSN nudges in a chat to the right window, and not open a
new conversation for the person who sent the nudge.
Fixes #4542.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 19 Jul 2008 03:07:33 +0000 |
| parents | 48024418982c |
| children | a556012a56b9 |
comparison
equal
deleted
inserted
replaced
| 23571:49850f7ca393 | 23572:2eefa8dc7481 |
|---|---|
| 976 | 976 |
| 977 swboard = cmdproc->data; | 977 swboard = cmdproc->data; |
| 978 account = cmdproc->session->account; | 978 account = cmdproc->session->account; |
| 979 user = msg->remote_user; | 979 user = msg->remote_user; |
| 980 | 980 |
| 981 serv_got_attention(account->gc, user, MSN_NUDGE); | 981 if (swboard->current_users > 1 || |
| 982 ((swboard->conv != NULL) && | |
| 983 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) | |
| 984 purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); | |
| 985 | |
| 986 else | |
| 987 purple_prpl_got_attention(account->gc, user, MSN_NUDGE); | |
| 982 | 988 |
| 983 } else if (!strcmp(id, "2")) { | 989 } else if (!strcmp(id, "2")) { |
| 984 /* Wink */ | 990 /* Wink */ |
| 985 | 991 |
| 986 } else if (!strcmp(id, "3")) { | 992 } else if (!strcmp(id, "3")) { |