# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1233962865 0
# Node ID 385473abc18b0dbfdccac3140ad5c5a7467fed06
# Parent  e841bad196e0525805f57c34573ae80873dd9b7a
Merge

diff -r e841bad196e0 -r 385473abc18b libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c	Fri Feb 06 23:19:27 2009 +0000
+++ b/libpurple/protocols/msn/msg.c	Fri Feb 06 23:27:45 2009 +0000
@@ -956,11 +956,10 @@
 			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 */