summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cfgfiles.c2
-rw-r--r--src/common/hexchat.h1
-rw-r--r--src/common/text.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index c7a89665..4b8a4c8d 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -558,7 +558,6 @@ const struct prefs vars[] =
 	{"perl_warnings", P_OFFINT (hex_perl_warnings), TYPE_BOOL},
 
 	{"sound_command", P_OFFSET (hex_sound_command), TYPE_STR},
-	{"sound_dir", P_OFFSET (hex_sound_dir), TYPE_STR},
 
 	{"stamp_log", P_OFFINT (hex_stamp_log), TYPE_BOOL},
 	{"stamp_log_format", P_OFFSET (hex_stamp_log_format), TYPE_STR},
@@ -779,7 +778,6 @@ load_config (void)
 	strcpy (prefs.hex_irc_quit_reason, prefs.hex_irc_part_reason);
 	strcpy (prefs.hex_irc_real_name, realname);
 	strcpy (prefs.hex_irc_user_name, username);
-	snprintf (prefs.hex_sound_dir, sizeof (prefs.hex_sound_dir), "%s" G_DIR_SEPARATOR_S "sounds", get_xdir ());
 	strcpy (prefs.hex_stamp_log_format, "%b %d %H:%M:%S ");
 	strcpy (prefs.hex_stamp_text_format, "[%H:%M:%S] ");
 #ifdef WIN32
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 3291d93a..906dcabf 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -337,7 +337,6 @@ struct hexchatprefs
 	char hex_net_proxy_pass[32];
 	char hex_net_proxy_user[32];
 	char hex_sound_command[PATHLEN + 1];
-	char hex_sound_dir[PATHLEN + 1];
 	char hex_stamp_log_format[64];
 	char hex_stamp_text_format[64];
 	char hex_text_background[PATHLEN + 1];
diff --git a/src/common/text.c b/src/common/text.c
index 8eabfec9..946ac542 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -2243,7 +2243,7 @@ sound_play (const char *file, gboolean quiet)
 	}
 	else
 	{
-		wavfile = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", prefs.hex_sound_dir, file);
+		wavfile = g_build_filename (get_xdir (), "sounds", file, NULL);
 	}
 
 	if (g_access (wavfile, R_OK) == 0)