iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of bundled beep

Browse Source
This commit is contained in:
Berke Viktor 2013-04-27 23:00:18 +02:00
parent 8e3db00dac
commit 6001ceff9f
15 changed files with 20 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -178,14 +178,14 @@ dnl *********************************************************************
dnl ** GLIB *************************************************************
dnl *********************************************************************
AM_PATH_GLIB_2_0(2.20.0, glib=yes, glib=no)
AM_PATH_GLIB_2_0(2.14.0, glib=yes, glib=no)
if test "$glib" = no; then
AC_MSG_ERROR(Cannot find GLib!)
fi
COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
COMMON_LIBS="$GLIB_LIBS"
COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0 -lgio-2.0"
COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0"
dnl *********************************************************************
dnl ** GTK **************************************************************
@ -933,7 +933,6 @@ Makefile
share/Makefile
share/icons/Makefile
share/misc/Makefile
share/sounds/Makefile
src/Makefile
src/common/Makefile
src/common/dbus/Makefile

2
share/Makefile.am
View File

@ -1,3 +1,3 @@
if DO_GTK
SUBDIRS = icons sounds misc
SUBDIRS = icons misc
endif

2
share/doc/readme.md
View File

@ -22,7 +22,7 @@ in general. HexChat runs on most BSD and POSIX compliant operating systems.
## Requirements:
* GTK+ 2.14
* GLib 2.20
* GLib 2.14
HexChat is known to work on, at least:

11
share/sounds/Makefile.am
View File

@ -1,11 +0,0 @@
sound_DATA = beep.wav
sounddir = $(datadir)/sounds/freedesktop/stereo
UPDATE_SOUND_CACHE = touch -m $(datadir)/sounds/freedesktop || :
install-data-hook:
mv $(DESTDIR)$(datadir)/sounds/freedesktop/stereo/beep.wav $(DESTDIR)$(datadir)/sounds/freedesktop/stereo/hexchat_beep.wav
$(UPDATE_SOUND_CACHE);
uninstall-hook:
$(UPDATE_SOUND_CACHE);

BIN
share/sounds/beep.wav
View File

Binary file not shown.

22
src/common/cfgfiles.c
View File

@ -23,8 +23,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <gio/gio.h>
#include "hexchat.h"
#include "cfgfiles.h"
#include "util.h"
@ -628,8 +626,6 @@ load_config (void)
#ifdef WIN32
char out[256];
#endif
GFile *beepsrc;
GFile *beepdest;
check_prefs_dir ();
username = g_get_user_name ();
@ -847,23 +843,7 @@ load_config (void)
g_free (buf);
buf = g_build_filename (get_xdir (), "sounds", NULL);
if (g_mkdir (buf, 0700) == 0)
{
g_free (buf);
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 "sounds" G_DIR_SEPARATOR_S "beep.wav");
#else
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);
g_file_copy (beepsrc, beepdest, G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, NULL);
g_object_unref (beepsrc);
g_object_unref (beepdest);
}
g_mkdir (buf, 0700);
g_free (buf);
}
if (prefs.hex_gui_win_height < 138)

2
src/common/ctcp.c
View File

@ -175,7 +175,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
#else
if (strchr (word[5], '/') == NULL)
#endif
sound_play (word[5], TRUE, FALSE);
sound_play (word[5], TRUE);
return;
}
}

2
src/common/outbound.c
View File

@ -3161,7 +3161,7 @@ cmd_splay (struct session *sess, char *tbuf, char *word[], char *word_eol[])
{
if (*word[2])
{
sound_play (word[2], FALSE, FALSE);
sound_play (word[2], FALSE);
return TRUE;
}

12
src/common/text.c
View File

@ -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

2
src/common/text.h
View File

@ -53,7 +53,7 @@ int get_stamp_str (char *fmt, time_t tim, char **ret);
void format_event (session *sess, int index, char **args, char *o, int sizeofo, unsigned int stripcolor_args);
char *text_find_format_string (char *name);
void sound_play (const char *file, gboolean quiet, gboolean hexchat_beep);
void sound_play (const char *file, gboolean quiet);
void sound_play_event (int i);
void sound_beep (session *);
void sound_load ();

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

@ -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

2
src/fe-gtk/setup.c
View File

@ -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

1
win32/hexchat.props
View File

@ -73,7 +73,6 @@ 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\"

1
win32/installer/hexchat-x64.skel.iss
View File

@ -85,7 +85,6 @@ Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion;
;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines
Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "share\sounds\beep.wav"; DestDir: "{app}\share\sounds"; Flags: ignoreversion; Components: libs
Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations

1
win32/installer/hexchat-x86.skel.iss
View File

@ -84,7 +84,6 @@ Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion;
;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines
Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "share\sounds\beep.wav"; DestDir: "{app}\share\sounds"; Flags: ignoreversion; Components: libs
Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations