Mercurial > pidgin
diff src/gtkpounce.c @ 11642:58bc500cf226
[gaim-migrate @ 13919]
sf patch #1324285, from Casey Harkins
fix "sounds while away" in HEAD
This patch adds a GaimAccount as a parameter to the
sound playing functions, allowing the caller to specify
the account the sound is related to. If the account is
not NULL and the while_away preference is not set, then
the account is checked to see if it is away, if so, the
sound is not played.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 12 Oct 2005 02:27:32 +0000 |
| parents | 17142948653e |
| children | 969fd533bd5d |
line wrap: on
line diff
--- a/src/gtkpounce.c Tue Oct 11 16:20:29 2005 +0000 +++ b/src/gtkpounce.c Wed Oct 12 02:27:32 2005 +0000 @@ -139,9 +139,9 @@ filename = gtk_entry_get_text(GTK_ENTRY(entry)); if (filename != NULL && *filename != '\0') - gaim_sound_play_file((char *) filename); + gaim_sound_play_file(filename, NULL); else - gaim_sound_play_event(GAIM_SOUND_POUNCE_DEFAULT); + gaim_sound_play_event(GAIM_SOUND_POUNCE_DEFAULT, NULL); } static void @@ -1102,9 +1102,9 @@ "play-sound", "filename"); if (sound != NULL) - gaim_sound_play_file(sound); + gaim_sound_play_file(sound, account); else - gaim_sound_play_event(GAIM_SOUND_POUNCE_DEFAULT); + gaim_sound_play_event(GAIM_SOUND_POUNCE_DEFAULT, account); } }