[Gaim-commits] CVS: gaim/src/protocols/jabber message.c,1.8,1.9

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1:/tmp/cvs-serv10217/src/protocols/jabber

Modified Files:
	message.c 
Log Message:
this mostly works (add/remove button is quirky) but is the RightWay(TM) to do things


Index: message.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/message.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- message.c	12 Oct 2003 18:40:28 -0000	1.8
+++ message.c	14 Oct 2003 03:46:00 -0000	1.9
@@ -63,12 +63,20 @@ static void handle_chat(JabberMessage *j
 	jb = jabber_buddy_find(jm->js, jm->from, TRUE);
 	jbr = jabber_buddy_find_resource(jb, jabber_get_resource(jm->from));
 
-	if(gaim_find_conversation_with_account(jm->from, jm->js->gc->account))
+	if(gaim_find_conversation_with_account(jm->from, jm->js->gc->account)) {
 		from = g_strdup(jm->from);
-	else if(jid->node)
+	} else  if(jid->node) {
+		GaimConversation *conv;
+
 		from = g_strdup_printf("%s@%s", jid->node, jid->domain);
-	else
+		conv = gaim_find_conversation_with_account(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);
+	}
 
 	if(!jm->xhtml && !jm->body) {
 		if(jm->events & JABBER_MESSAGE_EVENT_COMPOSING)