pidgin: 8788ad89: Oops, that wasn't meant to be left in as...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8788ad89991015afa677dca912fa12dba5b5f1f1
Ancestor: 649a416b7338f1cf5c4f622cbdca4401225982ee
Author: darkrain42 at pidgin.im
Date: 2010-02-10T06:43:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8788ad89991015afa677dca912fa12dba5b5f1f1

Modified files:
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c

ChangeLog: 

Oops, that wasn't meant to be left in as a warning, but noting these is probably good.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/message.c	9b0d9a5596b4f3c99d856e3f2347199f6d6e4de0
+++ libpurple/protocols/jabber/message.c	e18d15fa75d589176373378e99add5ccb437449c
@@ -86,8 +86,10 @@ static void handle_chat(JabberMessage *j
 		PurpleConversation *conv;
 
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, jm->from, account);
-		if (conv)
+		if (conv && !g_str_equal(jm->from, purple_conversation_get_name(conv))) {
+			purple_debug_info("jabber", "Binding conversation to %s\n", jm->from);
 			purple_conversation_set_name(conv, jm->from);
+		}
 	}
 
 	if(!jm->xhtml && !jm->body) {
============================================================
--- libpurple/protocols/jabber/presence.c	cbc82d833bc7dcf8c338ff7575ad01f90b2ce2de
+++ libpurple/protocols/jabber/presence.c	aaacf23ca91a318035ad4e0231ed4794a892eb07
@@ -972,7 +972,7 @@ void jabber_presence_parse(JabberStream 
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
 				buddy_name, account);
 		if (conv) {
-			purple_debug_warning("jabber", "Changed conversation binding from %s to %s\n",
+			purple_debug_info("jabber", "Changed conversation binding from %s to %s\n",
 					purple_conversation_get_name(conv), buddy_name);
 			purple_conversation_set_name(conv, buddy_name);
 		}