summary refs log tree commit diff stats
path: root/src/common/text.c
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2013-04-27 23:00:18 +0200
committerBerke Viktor <bviktor@hexchat.org>2013-04-27 23:00:18 +0200
commit6001ceff9f9383c4c3f04e056cd09b118d11b044 (patch)
tree5002d853e10113de30184c943c66984588765581 /src/common/text.c
parent8e3db00daccbad5c0c87c6f6d118a9db44238ab3 (diff)
Get rid of bundled beep
Diffstat (limited to 'src/common/text.c')
-rw-r--r--src/common/text.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/common/text.c b/src/common/text.c
index da677c88..905a3ce9 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -2221,7 +2221,7 @@ sound_find_command (void)
 }
 
 void
-sound_play (const char *file, gboolean quiet, gboolean hexchat_beep)
+sound_play (const char *file, gboolean quiet)
 {
 	char *buf;
 	char *wavfile;
@@ -2234,10 +2234,10 @@ sound_play (const char *file, gboolean quiet, gboolean hexchat_beep)
 	}
 
 #ifdef WIN32
-	/* check for fullpath; also use full path if hexchat_beep is TRUE, which should *only* happen when invoked by fe_beep() */
-	if (hexchat_beep || file[0] == '\\' || (((file[0] >= 'A' && file[0] <= 'Z') || (file[0] >= 'a' && file[0] <= 'z')) && file[1] == ':'))
+	/* check for fullpath */
+	if (file[0] == '\\' || (((file[0] >= 'A' && file[0] <= 'Z') || (file[0] >= 'a' && file[0] <= 'z')) && file[1] == ':'))
 #else
-	if (hexchat_beep || file[0] == '/')
+	if (file[0] == '/')
 #endif
 	{
 		wavfile = g_strdup (file);
@@ -2280,7 +2280,9 @@ void
 sound_play_event (int i)
 {
 	if (sound_files[i])
-		sound_play (sound_files[i], FALSE, FALSE);
+	{
+		sound_play (sound_files[i], FALSE);
+	}
 }
 
 static void