[Gaim-commits] CVS: gaim/src buddy_chat.c,1.148,1.149

[Sean E. <sea...@us...>]

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

Modified Files:
	buddy_chat.c 
Log Message:
Attempt #11.  This got embarrassing at attempt 3 -- now it's just ludicrous.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- buddy_chat.c	6 May 2002 19:07:00 -0000	1.148
+++ buddy_chat.c	6 May 2002 19:17:14 -0000	1.149
@@ -715,20 +715,20 @@
 			flag |= WFLAG_SEND;
 		} else {
 		       	flag |= WFLAG_RECV;
+			if (find_nick(g->gc, message))
+				flag |= WFLAG_NICK;
 		}
 		g_free(str);
 	}
 
-	if (flag & WFLAG_RECV && b->makesound) 
-	{
-		if (sound_options & OPT_SOUND_CHAT_NICK && find_nick(b->gc, message))
+	if (flag & WFLAG_RECV && b->makesound) {
+		if (flags & WFLAG_NICK && (sound_options & OPT_SOUND_CHAT_NICK)) {
 			play_sound(SND_CHAT_NICK);
-		else
+		} else {
 			play_sound(SND_CHAT_SAY);
-		if(find_nick(b->gc, message))
-			flag |= WFLAG_NICK;
+		}
 	}
-	write_to_conv(b, message, flag, who, mtime, -1);
+		write_to_conv(b, message, flag, who, mtime, -1);
 }