moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-22 17:22:18 -05:00
Code Issues Releases Wiki Activity

fix omitting custom sounds

Browse Source
This commit is contained in:
TingPing 2013-04-23 00:45:37 -04:00
parent bd73c80152
commit 2550a94f05
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/text.c
View File

@ -2187,12 +2187,15 @@ char *sound_files[NUM_XP];
void void
sound_beep (session *sess) sound_beep (session *sess)
{ {
if (sound_files[XP_TE_BEEP] && sound_files[XP_TE_BEEP][0]) if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1)
/* user defined beep _file_ */ {
sound_play_event (XP_TE_BEEP); if (sound_files[XP_TE_BEEP] && sound_files[XP_TE_BEEP][0])
else /* user defined beep _file_ */
/* system beep */ sound_play_event (XP_TE_BEEP);
fe_beep (sess); else
/* system beep */
fe_beep (sess);
}
} }
static char * static char *

11
src/fe-gtk/fe-gtk.c
View File

@ -671,16 +671,13 @@ fe_beep (session *sess)
{ {
char *beepfile; char *beepfile;
if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1)
{
#ifdef WIN32 /* keep this in sync with cfgfiles.c! */ #ifdef WIN32 /* keep this in sync with cfgfiles.c! */
beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL); beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL);
#else #else
beepfile = g_build_filename (HEXCHATSHAREDIR, "sounds", "freedesktop", "stereo", "hexchat_beep.wav", NULL); beepfile = g_build_filename (HEXCHATSHAREDIR, "sounds", "freedesktop", "stereo", "hexchat_beep.wav", NULL);
#endif #endif
sound_play (beepfile, TRUE, TRUE); sound_play (beepfile, TRUE, TRUE);
g_free (beepfile); g_free (beepfile);
}
} }
void void