# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1265784231 0
# Node ID 1d58c44c87f4ffc637a09ed02a2e65643e888742
# Parent  fbe2824286ce4331c77655ba0305dce5c076b9c5
Oops, that wasn't meant to be left in as a warning, but noting these is probably good.

diff -r fbe2824286ce -r 1d58c44c87f4 libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Wed Feb 10 06:01:58 2010 +0000
+++ b/libpurple/protocols/jabber/message.c	Wed Feb 10 06:43:51 2010 +0000
@@ -86,8 +86,10 @@
 		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) {
diff -r fbe2824286ce -r 1d58c44c87f4 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Wed Feb 10 06:01:58 2010 +0000
+++ b/libpurple/protocols/jabber/presence.c	Wed Feb 10 06:43:51 2010 +0000
@@ -972,7 +972,7 @@
 		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);
 		}