Mercurial > pidgin.yaz
changeset 29408:1d58c44c87f4
Oops, that wasn't meant to be left in as a warning, but noting these is probably good.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 10 Feb 2010 06:43:51 +0000 |
| parents | fbe2824286ce |
| children | f521dd7c75b5 |
| files | libpurple/protocols/jabber/message.c libpurple/protocols/jabber/presence.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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); }