[Gaim-commits] CVS: gaim/src buddy_chat.c,1.119,1.120 conversation.c,1.269,1.270

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv7340

Modified Files:
	buddy_chat.c conversation.c 
Log Message:
logic error


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- buddy_chat.c	2001/09/28 12:15:54	1.119
+++ buddy_chat.c	2001/09/28 23:35:43	1.120
@@ -486,7 +486,7 @@
 				continue;
 			}
 			if (g_strncasecmp(nick + 1, entered, strlen(entered))) {
-				if (nick[0] != '@' && nick[1] != '+') {
+				if (nick[0] != '@' || nick[1] != '+') {
 					nicks = nicks->next;
 					continue;
 				}

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- conversation.c	2001/09/28 12:15:54	1.269
+++ conversation.c	2001/09/28 23:35:44	1.270
@@ -1504,7 +1504,7 @@
 			g_free(t2);
 		}
 
-		if (!(flags & WFLAG_NOLOG) && ((logging_options & OPT_LOG_ALL) || find_log_info(c->name))) {
+		if ((logging_options & OPT_LOG_ALL) || find_log_info(c->name)) {
 			char *t1, *t2;
 			char *nm = g_malloc(256);
 			if (c->is_chat)