Mercurial > pidgin
changeset 3219:639960efc6ff
[gaim-migrate @ 3236]
They convinced me to make it compile before committing.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 06 May 2002 17:05:14 +0000 |
| parents | 2bc01c8f6c61 |
| children | 4d1defeb8234 |
| files | src/buddy_chat.c src/gaim.h |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy_chat.c Mon May 06 16:50:06 2002 +0000 +++ b/src/buddy_chat.c Mon May 06 17:05:14 2002 +0000 @@ -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);
--- a/src/gaim.h Mon May 06 16:50:06 2002 +0000 +++ b/src/gaim.h Mon May 06 17:05:14 2002 +0000 @@ -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 */