Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

[gaim-migrate @ 15669]

Thu, 16 Feb 2006 23:02:56 +0000

author

Sean Egan <seanegan@pidgin.im>

date

Thu, 16 Feb 2006 23:02:56 +0000

changeset 13304

4ad9297570d2

parent 13303

363bbd11e88f

child 13305

3ab316015b2b

[gaim-migrate @ 15669]
There was an attempt to make each Jabber resource have its own conversation
window, which wasn't working, and instead sending outgoing messages to the
wrong resource. Different conversations with each resource breaks the whole
"Send to" one-window-per-person metaphor, so I just changed the behavior to
send messages to whichever resources last messaged you. Perhaps later, when
we're not in a freeze, we can consider an API that allows prpls to populate
the Send To menu themselves, letting you easily switch what resource you're
chatting with in the same window

--- a/src/protocols/jabber/message.c	Thu Feb 16 20:50:10 2006 +0000
+++ b/src/protocols/jabber/message.c	Thu Feb 16 23:02:56 2006 +0000
@@ -73,10 +73,10 @@
 			GaimConversation *conv;
 
 			from = g_strdup_printf("%s@%s", jid->node, jid->domain);
-			conv = jabber_find_unnormalized_conv(from, jm->js->gc->account);
+			conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, from, jm->js->gc->account);
 			if(conv) {
 				gaim_conversation_set_name(conv, jm->from);
-			}
+				}
 			g_free(from);
 		}
 		from = g_strdup(jm->from);