Mercurial > pidgin.yaz
changeset 3072:359b4cd0e766
[gaim-migrate @ 3086]
Sound bugfix; thanks Robot101.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sun, 17 Mar 2002 18:29:17 +0000 |
| parents | 55fa49dc545e |
| children | 22c82a341c32 |
| files | .cvsignore src/prefs.c src/sound.c |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.cvsignore Sun Mar 17 06:43:54 2002 +0000 +++ b/.cvsignore Sun Mar 17 18:29:17 2002 +0000 @@ -23,3 +23,4 @@ depcomp stamp-h1 configure.in +autom4te.cache
--- a/src/prefs.c Sun Mar 17 06:43:54 2002 +0000 +++ b/src/prefs.c Sun Mar 17 18:29:17 2002 +0000 @@ -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 */
--- a/src/sound.c Sun Mar 17 06:43:54 2002 +0000 +++ b/src/sound.c Sun Mar 17 18:29:17 2002 +0000 @@ -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"), OPT_SOUND_RECV, Receive, sizeof(Receive), N_("Message recieved begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive), - N_("Message recieved"), OPT_SOUND_RECV, 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 {