[Gaim-commits] CVS: gaim/src buddy_chat.c,1.144,1.145 gaim.h,1.321,1.322

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

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

Modified Files:
	buddy_chat.c gaim.h 
Log Message:
They convinced me to make it compile before committing.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- buddy_chat.c	6 May 2002 16:47:50 -0000	1.144
+++ buddy_chat.c	6 May 2002 17:05:14 -0000	1.145
@@ -722,7 +722,8 @@
 	}
 
 	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
-		play_sound(SND_CHAT_NICK);
+		if (b->makesound && !(sound_options & OPT_SOUND_CHAT_SAY))
+			play_sound(SND_CHAT_NICK);
 		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.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- gaim.h	6 May 2002 16:50:06 -0000	1.321
+++ gaim.h	6 May 2002 17:05:14 -0000	1.322
@@ -283,7 +283,7 @@
 #define OPT_SOUND_ARTSC			0x00008000
 #define OPT_SOUND_ESD			0x00010000
 #define OPT_SOUND_CMD			0x00020000
-#define OPT_SOUND_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
@@ -295,7 +295,8 @@
 #define SND_CHAT_YOU_SAY 7
 #define SND_CHAT_SAY 8
 #define SND_POUNCE_DEFAULT 9
-#define NUM_SOUNDS 10
+#define SND_CHAT_NICK 10
+#define NUM_SOUNDS 11
 extern char *sound_file[NUM_SOUNDS];
 
 /* global sound struct */