cpw.malu.xmpp.attention: 2b35112f: Give username (JID) to purple_prpl_got_a...
malu at pidgin.im
malu at pidgin.im
Fri Jan 16 16:46:33 EST 2009
-----------------------------------------------------------------
Revision: 2b35112ffabaf2b2eb1099d7dcff42b98c654ccb
Ancestor: 6fb9ff94b6589f04e961cdefd6297169cee214dd
Author: malu at pidgin.im
Date: 2009-01-16T21:40:25
Branch: im.pidgin.cpw.malu.xmpp.attention
URL: http://d.pidgin.im/viewmtn/revision/info/2b35112ffabaf2b2eb1099d7dcff42b98c654ccb
Modified files:
libpurple/protocols/jabber/message.c
ChangeLog:
Give username (JID) to purple_prpl_got_attention, not alias
Should eliminate duplicate conversations appearing
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/message.c 3dad684db0eb1df0fce414e139f33a5628f61127
+++ libpurple/protocols/jabber/message.c 49dcd87c746553ee7630c5256159600f249ebab5
@@ -290,7 +290,6 @@ static void handle_buzz(JabberMessage *j
PurpleBuddy *buddy;
PurpleAccount *account;
PurpleConversation *c;
- char *username;
/* Delayed buzz MUST NOT be accepted */
if(jm->delayed)
@@ -309,11 +308,8 @@ static void handle_buzz(JabberMessage *j
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 */
More information about the Commits
mailing list