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

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

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

Modified Files:
	message.c 
Log Message:
don't rename chats when someone privately IMs you from one


Index: message.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/message.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- message.c	21 Oct 2003 17:18:46 -0000	1.12
+++ message.c	23 Oct 2003 12:54:08 -0000	1.13
@@ -53,7 +53,7 @@ void jabber_message_free(JabberMessage *
 }
 
 static GaimConversation *
-find_unnormalized_conv(const char *name, GaimAccount *account)
+find_unnormalized_im(const char *name, GaimAccount *account)
 {
 	GaimConversation *c = NULL;
 	GList *cnv;
@@ -62,7 +62,8 @@ find_unnormalized_conv(const char *name,
 
 	for(cnv = gaim_get_conversations(); cnv; cnv = cnv->next) {
 		c = (GaimConversation*)cnv->data;
-		if(!gaim_utf8_strcasecmp(name, gaim_conversation_get_name(c)) &&
+		if(gaim_conversation_get_type(c) == GAIM_CONV_IM &&
+				!gaim_utf8_strcasecmp(name, gaim_conversation_get_name(c)) &&
 				account == gaim_conversation_get_account(c))
 			return c;
 	}
@@ -84,13 +85,13 @@ static void handle_chat(JabberMessage *j
 	jb = jabber_buddy_find(jm->js, jm->from, TRUE);
 	jbr = jabber_buddy_find_resource(jb, jid->resource);
 
-	if(find_unnormalized_conv(jm->from, jm->js->gc->account)) {
+	if(find_unnormalized_im(jm->from, jm->js->gc->account)) {
 		from = g_strdup(jm->from);
 	} else  if(jid->node) {
 		GaimConversation *conv;
 
 		from = g_strdup_printf("%s@%s", jid->node, jid->domain);
-		conv = find_unnormalized_conv(from, jm->js->gc->account);
+		conv = find_unnormalized_im(from, jm->js->gc->account);
 		if(conv)
 			gaim_conversation_set_name(conv, jm->from);
 		g_free(from);