diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2013-04-27 23:00:18 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2013-04-27 23:00:18 +0200 |
| commit | 6001ceff9f9383c4c3f04e056cd09b118d11b044 (patch) | |
| tree | 5002d853e10113de30184c943c66984588765581 /src/fe-gtk | |
| parent | 8e3db00daccbad5c0c87c6f6d118a9db44238ab3 (diff) | |
Get rid of bundled beep
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 13 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 603025d1..e11eeaf6 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -660,15 +660,10 @@ fe_print_text (struct session *sess, char *text, time_t stamp) void fe_beep (session *sess) { - char *beepfile; - -#ifdef WIN32 /* keep this in sync with cfgfiles.c! */ - beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL); -#else - beepfile = g_build_filename (HEXCHATSHAREDIR, "sounds", "freedesktop", "stereo", "hexchat_beep.wav", NULL); -#endif - sound_play (beepfile, TRUE, TRUE); - g_free (beepfile); + if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1) + { + gdk_beep (); + } } void diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 02e8605d..fd239c9d 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -1660,7 +1660,7 @@ setup_snd_browse_cb (GtkWidget *button, GtkEntry *entry) static void setup_snd_play_cb (GtkWidget *button, GtkEntry *entry) { - sound_play (entry->text, FALSE, FALSE); + sound_play (entry->text, FALSE); } static void |