SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move beep to proper place

This commit is contained in:
Berke Viktor 2013-04-16 11:32:58 +02:00
parent 7e2ae20ecf
commit ccc8601624
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
win32/copy/share/beep.wav → share/sounds/beep.wav
View File

4
src/common/cfgfiles.c
View File

@ -844,9 +844,9 @@ load_config (void)
buf = g_build_filename (get_xdir (), "sounds", "beep.wav", NULL); buf = g_build_filename (get_xdir (), "sounds", "beep.wav", NULL);
#ifdef WIN32 /* keep this in sync with fe-gtk.c! */ #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 #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 #endif
beepdest = g_file_new_for_path (buf); beepdest = g_file_new_for_path (buf);

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

@ -674,9 +674,9 @@ fe_beep (session *sess)
if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1) 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", "beep.wav", NULL); beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL);
#else #else
beepfile = g_build_filename (HEXCHATSHAREDIR, "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);

1
win32/hexchat.props
View File

@ -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 etc "$(HexChatRel)\etc"
xcopy /q /s /i share "$(HexChatRel)\share" xcopy /q /s /i share "$(HexChatRel)\share"
xcopy /q /s /i "..\..\share\doc\COPYING" "$(HexChatRel)\share\doc\hexchat\" 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)\share\doc" "$(HexChatRel)\share\doc"
xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\" xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"
xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\" xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\"