[Gaim-commits] CVS: gaim/src prefs.c,1.219,1.220 sound.c,1.51,1.52

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

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

Modified Files:
	prefs.c sound.c 
Log Message:
Sound bugfix; thanks Robot101.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- prefs.c	16 Mar 2002 20:14:24 -0000	1.219
+++ prefs.c	17 Mar 2002 18:29:17 -0000	1.220
@@ -1743,8 +1743,8 @@
 	gtk_widget_show(vbox);
 
 	for (j=0; j < NUM_SOUNDS; j++) {
-		/* no entry for the buddy pounce sound, it's configurable per-pounce */
-		if (j == SND_POUNCE_DEFAULT)
+		/* no entry for sounds without an option */
+		if (sounds[j].opt == 0)
 			continue;
 
 		/* seperators before SND_RECEIVE and SND_CHAT_JOIN */

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sound.c	16 Mar 2002 00:32:53 -0000	1.51
+++ sound.c	17 Mar 2002 18:29:17 -0000	1.52
@@ -58,14 +58,14 @@
 struct sound_struct sounds[NUM_SOUNDS] = {
 	N_("Buddy logs in"), OPT_SOUND_LOGIN, BuddyArrive, sizeof(BuddyArrive),
 	N_("Buddy logs out"), OPT_SOUND_LOGOUT, BuddyLeave, sizeof(BuddyLeave),
-	N_("Message recieved begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive),
 	N_("Message recieved"), OPT_SOUND_RECV, Receive, sizeof(Receive),
+	N_("Message recieved begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive),
 	N_("Message sent"), OPT_SOUND_SEND, Send, sizeof(Send),
 	N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, BuddyArrive, sizeof(BuddyArrive),
 	N_("Person leaves chat"), OPT_SOUND_CHAT_PART, BuddyLeave, sizeof(BuddyLeave),
 	N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, Send, sizeof(Send),
 	N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, Receive, sizeof(Receive),
-	NULL, NULL, &RedAlert, sizeof(RedAlert)
+	NULL, 0, RedAlert, sizeof(RedAlert)
 };
 
 static int check_dev(char *dev)
@@ -413,7 +413,7 @@
 	}
 
 	else if (sound_options & OPT_SOUND_NORMAL) {
-		debug_printf("attempting to play audio file with internal method -- this is unlikely to work");
+		debug_printf("attempting to play audio file with internal method -- this is unlikely to work\n");
 	}
 
 	pid = fork();
@@ -549,12 +549,12 @@
 		return;
 
 	if (sound >= NUM_SOUNDS) {
-		debug_printf("sorry old fruit... can't say I know that sound: ", sound);
+		debug_printf("sorry old fruit... can't say I know that sound: ", sound, "\n");
 		return;
 	}
 
 	/* check NULL for sounds that don't have an option, ie buddy pounce */
-	if ((sound_options & sounds[sound].opt) || (sounds[sound].opt == NULL)) {
+	if ((sound_options & sounds[sound].opt) || (sounds[sound].opt == 0)) {
 		if (sound_file[sound]) {
 			play_file(sound_file[sound]);
 		} else {