# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1020706802 0
# Node ID e13e569299ae8ecf2930ac53e25bc8777957d6d2
# Parent  ad8bdd73f2d68f17ee708e20a7b4e880b8259c20
[gaim-migrate @ 3240]
This is the last one--I promise.
This time it wasn't even broken--just doing something differently.

I should take a nap.

committer: Tailor Script <tailor@pidgin.im>

diff -r ad8bdd73f2d6 -r e13e569299ae src/buddy_chat.c
--- a/src/buddy_chat.c	Mon May 06 17:21:18 2002 +0000
+++ b/src/buddy_chat.c	Mon May 06 17:40:02 2002 +0000
@@ -661,6 +661,8 @@
 	n = strlen(who);
 	g_strdown(who);
 
+	debug_printf("\n%s\n%s\n%s\n\n", gc->username, gc->displayname, message);
+
 	if ((p = strstr(msg, who)) != NULL) {
 		if (((p == msg) || !isalnum(*(p - 1))) && !isalnum(*(p + n))) {
 			g_free(who);
@@ -714,7 +716,7 @@
 				play_sound(SND_CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
 		} else {
-			if (b->makesound)
+			if (b->makesound && !(sound_options & OPT_SOUND_CHAT_NICK))
 				play_sound(SND_CHAT_SAY);
 			flag |= WFLAG_RECV;
 		}
@@ -722,7 +724,7 @@
 	}
 
 	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
-		if (b->makesound && !(sound_options & OPT_SOUND_CHAT_SAY))
+		if (b->makesound)
 			play_sound(SND_CHAT_NICK);
 		flag |= WFLAG_NICK;
 	}