From ccc86016244aaec2d95ceca226ffb0115ef31871 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Tue, 16 Apr 2013 11:32:58 +0200
Subject: Move beep to proper place

---
 share/sounds/beep.wav     | Bin 0 -> 17684 bytes
 src/common/cfgfiles.c     |   4 ++--
 src/fe-gtk/fe-gtk.c       |   4 ++--
 win32/copy/share/beep.wav | Bin 17684 -> 0 bytes
 win32/hexchat.props       |   1 +
 5 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 share/sounds/beep.wav
 delete mode 100644 win32/copy/share/beep.wav

diff --git a/share/sounds/beep.wav b/share/sounds/beep.wav
new file mode 100644
index 00000000..099370f9
Binary files /dev/null and b/share/sounds/beep.wav differ
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 712f2bfa..e9486771 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -844,9 +844,9 @@ load_config (void)
 
 			buf = g_build_filename (get_xdir (), "sounds", "beep.wav", NULL);
 #ifdef WIN32	/* keep this in sync with fe-gtk.c! */
-			beepsrc = g_file_new_for_path (HEXCHATSHAREDIR G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S "beep.wav");
+			beepsrc = g_file_new_for_path (HEXCHATSHAREDIR G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S "sounds" G_DIR_SEPARATOR_S "beep.wav");
 #else
-			beepsrc = g_file_new_for_path (HEXCHATSHAREDIR G_DIR_SEPARATOR_S "hexchat" G_DIR_SEPARATOR_S "beep.wav");
+			beepsrc = g_file_new_for_path (HEXCHATSHAREDIR G_DIR_SEPARATOR_S "sounds" G_DIR_SEPARATOR_S "freedesktop" G_DIR_SEPARATOR_S "stereo" G_DIR_SEPARATOR_S "hexchat_beep.wav");
 #endif
 			beepdest = g_file_new_for_path (buf);
 
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 30a75478..ec947617 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -674,9 +674,9 @@ fe_beep (session *sess)
 	if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1)
 	{
 #ifdef WIN32	/* keep this in sync with cfgfiles.c! */
-		beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "beep.wav", NULL);
+		beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL);
 #else
-		beepfile = g_build_filename (HEXCHATSHAREDIR, "hexchat", "beep.wav", NULL);
+		beepfile = g_build_filename (HEXCHATSHAREDIR, "sounds", "freedesktop", "stereo", "hexchat_beep.wav", NULL);
 #endif
 		sound_play (beepfile, TRUE, TRUE);
 		g_free (beepfile);
diff --git a/win32/copy/share/beep.wav b/win32/copy/share/beep.wav
deleted file mode 100644
index 099370f9..00000000
Binary files a/win32/copy/share/beep.wav and /dev/null differ
diff --git a/win32/hexchat.props b/win32/hexchat.props
index cd8cb6bd..eb121ed5 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -77,6 +77,7 @@ xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib
 xcopy /q /s /i etc "$(HexChatRel)\etc"
 xcopy /q /s /i share "$(HexChatRel)\share"
 xcopy /q /s /i "..\..\share\doc\COPYING" "$(HexChatRel)\share\doc\hexchat\"
+xcopy /q /s /i "..\..\share\sounds\beep.wav" "$(HexChatRel)\share\sounds\"
 xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc"
 xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"
 xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\"
-- 
cgit 1.4.1