Mercurial > pidgin.yaz
changeset 9704:767a8f0c5740
[gaim-migrate @ 10564]
Gracie
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 07 Aug 2004 22:31:36 +0000 |
| parents | 1397a4594c4e |
| children | 9124c0ddc434 |
| files | ChangeLog src/gtkconv.c |
| diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Aug 07 21:11:22 2004 +0000 +++ b/ChangeLog Sat Aug 07 22:31:36 2004 +0000 @@ -2,11 +2,13 @@ version 0.82: Bug Fixes: - * Double screen names should no longer appear in text from a - Windows AIM users that was copy and pasted fromn another + * Double screen names should no longer appear in text from + Windows AIM users that was copy and pasted from another conversation (Jon Oberheide) * Selecting a buddy icon for a brand new account no longer causes a crash + * Delayed messages and system messages no longer cause + sound events to be triggered (Nathan Fredrickson) version 0.81 (08/05/2004): New Features:
--- a/src/gtkconv.c Sat Aug 07 21:11:22 2004 +0000 +++ b/src/gtkconv.c Sat Aug 07 22:31:36 2004 +0000 @@ -4959,13 +4959,13 @@ /* Play a sound, if specified in prefs. */ if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) && - !gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus)) { + !gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus) && + !(flags & GAIM_MESSAGE_DELAYED) && + !(flags & GAIM_MESSAGE_SYSTEM)) { + if (!(flags & GAIM_MESSAGE_WHISPER) && (flags & GAIM_MESSAGE_SEND)) gaim_sound_play_event(GAIM_SOUND_CHAT_YOU_SAY); - else if ((flags & GAIM_MESSAGE_RECV) && - !(flags & GAIM_MESSAGE_DELAYED) && - !(flags & GAIM_MESSAGE_SYSTEM)) { - + else if (flags & GAIM_MESSAGE_RECV) { if ((flags & GAIM_MESSAGE_NICK) && gaim_prefs_get_bool("/gaim/gtk/sound/enabled/nick_said")) {