changeset 25707:b707ec143eee

Give username (JID) to purple_prpl_got_attention, not alias Should eliminate duplicate conversations appearing
author Marcus Lundblad <ml@update.uu.se>
date Fri, 16 Jan 2009 21:40:25 +0000
parents 8dee1fb9d8e9
children 3f4bedafc86e
files libpurple/protocols/jabber/message.c
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c	Fri Jan 16 21:25:48 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Fri Jan 16 21:40:25 2009 +0000
@@ -290,7 +290,6 @@
 	PurpleBuddy *buddy;
 	PurpleAccount *account;
 	PurpleConversation *c;
-	char *username;
 
 	/* Delayed buzz MUST NOT be accepted */
 	if(jm->delayed)
@@ -309,11 +308,8 @@
 	if (c == NULL)
 		c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, jm->from);
 
-	username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
 	/* xmpp only has 1 attention type, so index is 0 */
-	purple_prpl_got_attention(jm->js->gc, username, 0);
-
-	g_free(username);
+	purple_prpl_got_attention(jm->js->gc, jm->from, 0);
 }
 
 /* used internally by the functions below */