changeset 2386:437ae28a1172

[gaim-migrate @ 2399] logic error committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 28 Sep 2001 23:35:44 +0000
parents bdc74764245c
children 6190f75950ff
files src/buddy_chat.c src/conversation.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy_chat.c	Fri Sep 28 12:15:54 2001 +0000
+++ b/src/buddy_chat.c	Fri Sep 28 23:35:44 2001 +0000
@@ -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;
 				}
--- a/src/conversation.c	Fri Sep 28 12:15:54 2001 +0000
+++ b/src/conversation.c	Fri Sep 28 23:35:44 2001 +0000
@@ -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)