pidgin: 8022890d: Properly send MSN nudges in a chat to th...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8022890df03cfa8cce52f7dee5b12ad58b64bbe6
Ancestor: 148bd4c3ab2963d35af3a588de256c61851d7401
Author: qulogic at pidgin.im
Date: 2008-07-19T03:07:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8022890df03cfa8cce52f7dee5b12ad58b64bbe6

Modified files:
        libpurple/protocols/msn/switchboard.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/switchboard.c	64e8c8bc764df6a6691002ff72c722e9ba02db2d
+++ libpurple/protocols/msn/switchboard.c	13a50815a79bbee9390d4fd53ae0cbc7ab093b45
@@ -978,8 +978,14 @@ datacast_msg(MsnCmdProc *cmdproc, MsnMes
 		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 */