[Gaim-commits] CVS: gaim/src buddy_chat.c,1.146,1.147 gaim.h,1.322,1.323

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

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

Modified Files:
	buddy_chat.c gaim.h 
Log Message:



Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- buddy_chat.c	6 May 2002 17:40:02 -0000	1.146
+++ buddy_chat.c	6 May 2002 18:25:14 -0000	1.147
@@ -661,8 +661,6 @@
 	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);
@@ -716,16 +714,16 @@
 				play_sound(SND_CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
 		} else {
-			if (b->makesound && !(sound_options & OPT_SOUND_CHAT_NICK))
-				play_sound(SND_CHAT_SAY);
-			flag |= WFLAG_RECV;
+		       	flag |= WFLAG_RECV;
 		}
 		g_free(str);
 	}
 
-	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
-		if (b->makesound)
+	if (flag & WFLAG_RECV && b->makesound) {
+	     	if (sound_options & OPT_SOUND_CHAT_NICK)
 			play_sound(SND_CHAT_NICK);
+		else
+			play_sound(SND_CHAT_SAY);
 		flag |= WFLAG_NICK;
 	}
 	write_to_conv(b, message, flag, who, mtime, -1);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- gaim.h	6 May 2002 17:05:14 -0000	1.322
+++ gaim.h	6 May 2002 18:25:14 -0000	1.323
@@ -283,7 +283,7 @@
 #define OPT_SOUND_ARTSC			0x00008000
 #define OPT_SOUND_ESD			0x00010000
 #define OPT_SOUND_CMD			0x00020000
-#define OPT_SOUND_CHAT_NICK                  0x00040000
+#define OPT_SOUND_CHAT_NICK             0x00040000
 /* remember to also change the struct in sound.c */
 #define SND_BUDDY_ARRIVE 0
 #define SND_BUDDY_LEAVE 1