# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1020712634 0
# Node ID aba6ee7f8aba384d9914b490606c84337848273a
# Parent  bd66e16f9250147306964ac4e0c109061cd2785e
[gaim-migrate @ 3243]
Attempt #11.  This got embarrassing at attempt 3 -- now it's just ludicrous.

committer: Tailor Script <tailor@pidgin.im>

diff -r bd66e16f9250 -r aba6ee7f8aba src/buddy_chat.c
--- a/src/buddy_chat.c	Mon May 06 19:07:00 2002 +0000
+++ b/src/buddy_chat.c	Mon May 06 19:17:14 2002 +0000
@@ -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);
 }