cpw.attention_ui: 47f58584: Merge

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 47f585845529ec2f856e92f34a2ef86470c8e967
Ancestor: a49654a3e15782010185a1e1ccfc9364fa12b554
Author: malu at pidgin.im
Date: 2009-02-06T23:27:45
Branch: im.pidgin.cpw.attention_ui
URL: http://d.pidgin.im/viewmtn/revision/info/47f585845529ec2f856e92f34a2ef86470c8e967

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

ChangeLog: 

Merge

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msg.c	1dee4010a67a9042d39981b2bada05e64792e702
+++ libpurple/protocols/msn/msg.c	9f8382b8b397eef9a466728a27a658f9aeef9c8f
@@ -956,11 +956,10 @@ msn_datacast_msg(MsnCmdProc *cmdproc, Ms
 			else
 				purple_prpl_got_attention(account->gc, user, MSN_NUDGE);
 
-			purple_conversation_attention(swboard->conv, user, MSN_NUDGE, 
-				PURPLE_MESSAGE_SEND, time(NULL));
 		} else {
 			purple_prpl_got_attention(account->gc, user, MSN_NUDGE);
 		}
+
 	} else if (!strcmp(id, "2")) {
 		/* Wink */