Mercurial > pidgin.yaz

changeset 29665:385473abc18b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Marcus Lundblad <ml@update.uu.se>
date Fri, 06 Feb 2009 23:27:45 +0000
parents e841bad196e0
children 4561aa5b368c
files libpurple/protocols/msn/msg.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 */