# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1216436853 0
# Node ID 2eefa8dc7481c5e031fbca5cd47f35aac2bac80e
# Parent  49850f7ca3933c1a34cfc74640fa55e3dd393632
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.

diff -r 49850f7ca393 -r 2eefa8dc7481 libpurple/protocols/msn/switchboard.c
--- a/libpurple/protocols/msn/switchboard.c	Sat Jul 19 03:03:17 2008 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Sat Jul 19 03:07:33 2008 +0000
@@ -978,7 +978,13 @@
 		account = cmdproc->session->account;
 		user = msg->remote_user;
 
-		serv_got_attention(account->gc, user, MSN_NUDGE);
+		if (swboard->current_users > 1 ||
+			((swboard->conv != NULL) &&
+			 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
+			purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE);
+
+		else
+			purple_prpl_got_attention(account->gc, user, MSN_NUDGE);
 
 	} else if (!strcmp(id, "2")) {
 		/* Wink */