Mercurial > pidgin.yaz
changeset 3224:b4c9646792f0
[gaim-migrate @ 3241]
*** empty log message ***
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 06 May 2002 18:25:14 +0000 |
| parents | e13e569299ae |
| children | bd66e16f9250 |
| files | src/buddy_chat.c src/gaim.h |
| diffstat | 2 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy_chat.c Mon May 06 17:40:02 2002 +0000 +++ b/src/buddy_chat.c Mon May 06 18:25:14 2002 +0000 @@ -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);
--- a/src/gaim.h Mon May 06 17:40:02 2002 +0000 +++ b/src/gaim.h Mon May 06 18:25: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_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