diff src/protocols/jabber/message.c @ 10490:a3a540ed2518

[gaim-migrate @ 11780] some random jabber stuff, remove a duplicate #define, and shuffle account loading so we're not emitting signals that haven't been registered yet committer: Tailor Script <[e-mail]>

--- a/src/protocols/jabber/message.c	Sat Jan 08 20:51:16 2005 +0000
+++ b/src/protocols/jabber/message.c	Sat Jan 08 21:10:17 2005 +0000
@@ -69,13 +69,16 @@
 	if(jabber_find_unnormalized_conv(jm->from, jm->js->gc->account)) {
 		from = g_strdup(jm->from);
 	} else  if(jid->node) {
-		GaimConversation *conv;
+		if(jid->resource) {
+			GaimConversation *conv;
 
-		from = g_strdup_printf("%s@%s", jid->node, jid->domain);
-		conv = jabber_find_unnormalized_conv(from, jm->js->gc->account);
-		if(conv)
-			gaim_conversation_set_name(conv, jm->from);
-		g_free(from);
+			from = g_strdup_printf("%s@%s", jid->node, jid->domain);
+			conv = jabber_find_unnormalized_conv(from, jm->js->gc->account);
+			if(conv) {
+				gaim_conversation_set_name(conv, jm->from);
+			}
+			g_free(from);
+		}
 		from = g_strdup(jm->from);
 	} else {
 		from = g_strdup(jid->domain);