Mercurial > pidgin.yaz
changeset 19115:4c26b23e7859
Moved:
$datadir/sounds/pidgin -> $datadir/sounds/purple
Pidgin and Finch both use $datadir/sounds/purple for their sound files.
| author | Eric Polino <aluink@pidgin.im> |
|---|---|
| date | Mon, 25 Jun 2007 20:27:36 +0000 |
| parents | 6de2e9ba0930 |
| children | 992afeb1d40f |
| files | Makefile.am configure.ac finch/gntsound.c pidgin/Makefile.am pidgin/gtksound.c pidgin/sounds/Makefile.am pidgin/sounds/Makefile.mingw pidgin/sounds/alert.wav pidgin/sounds/login.wav pidgin/sounds/logout.wav pidgin/sounds/receive.wav pidgin/sounds/send.wav share/Makefile.am share/sounds/Makefile.am share/sounds/Makefile.mingw share/sounds/alert.wav share/sounds/login.wav share/sounds/logout.wav share/sounds/receive.wav share/sounds/send.wav |
| diffstat | 20 files changed, 42 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Sun Jun 24 02:56:09 2007 +0000 +++ b/Makefile.am Mon Jun 25 20:27:36 2007 +0000 @@ -42,7 +42,7 @@ GNT_DIR=finch endif -SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po +SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po share docs: Doxyfile if HAVE_DOXYGEN
--- a/configure.ac Sun Jun 24 02:56:09 2007 +0000 +++ b/configure.ac Mon Jun 25 20:27:36 2007 +0000 @@ -2114,7 +2114,6 @@ pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile - pidgin/sounds/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc @@ -2147,6 +2146,8 @@ libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/version.h + share/Makefile + share/sounds/Makefile finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc
--- a/finch/gntsound.c Sun Jun 24 02:56:09 2007 +0000 +++ b/finch/gntsound.c Mon Jun 25 20:27:36 2007 +0000 @@ -537,7 +537,8 @@ char *filename = g_strdup(purple_prefs_get_path(file_pref)); if(!filename || !strlen(filename)) { g_free(filename); - filename = g_build_filename(DATADIR, "sounds", "finch", sounds[event].def, NULL); + /* XXX Consider creating a constant for "sounds/purple" to be shared with Pidgin */ + filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL); } purple_sound_play_file(filename, NULL);
--- a/pidgin/Makefile.am Sun Jun 24 02:56:09 2007 +0000 +++ b/pidgin/Makefile.am Mon Jun 25 20:27:36 2007 +0000 @@ -65,7 +65,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pidgin.pc -SUBDIRS = pixmaps plugins sounds +SUBDIRS = pixmaps plugins bin_PROGRAMS = pidgin
--- a/pidgin/gtksound.c Sun Jun 24 02:56:09 2007 +0000 +++ b/pidgin/gtksound.c Mon Jun 25 20:27:36 2007 +0000 @@ -543,7 +543,8 @@ char *filename = g_strdup(purple_prefs_get_path(file_pref)); if(!filename || !strlen(filename)) { g_free(filename); - filename = g_build_filename(DATADIR, "sounds", "pidgin", sounds[event].def, NULL); + /* XXX Consider creating a constant for "sounds/purple" to be shared with Finch */ + filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL); } purple_sound_play_file(filename, NULL);
--- a/pidgin/sounds/Makefile.am Sun Jun 24 02:56:09 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -soundsdir = $(datadir)/sounds/pidgin -sounds_DATA = \ - alert.wav \ - login.wav \ - logout.wav \ - receive.wav \ - send.wav - -EXTRA_DIST = \ - Makefile.mingw \ - $(sounds_DATA) -
--- a/pidgin/sounds/Makefile.mingw Sun Jun 24 02:56:09 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# -# Makefile.mingw -# -# Description: Makefile for win32 (mingw) version of Pidgin sounds -# - -PIDGIN_TREE_TOP := ../.. -include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak - -datadir := $(PIDGIN_INSTALL_DIR) -include ./Makefile.am - -.PHONY: install - -install: - if test '$(sounds_DATA)'; then \ - mkdir -p $(soundsdir); \ - cp $(sounds_DATA) $(soundsdir); \ - fi; -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/Makefile.am Mon Jun 25 20:27:36 2007 +0000 @@ -0,0 +1,2 @@ + +SUBDIRS = sounds
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/sounds/Makefile.am Mon Jun 25 20:27:36 2007 +0000 @@ -0,0 +1,12 @@ +soundsdir = $(datadir)/sounds/purple +sounds_DATA = \ + alert.wav \ + login.wav \ + logout.wav \ + receive.wav \ + send.wav + +EXTRA_DIST = \ + Makefile.mingw \ + $(sounds_DATA) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/share/sounds/Makefile.mingw Mon Jun 25 20:27:36 2007 +0000 @@ -0,0 +1,20 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Pidgin sounds +# + +PIDGIN_TREE_TOP := ../.. +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak + +datadir := $(PIDGIN_INSTALL_DIR) +include ./Makefile.am + +.PHONY: install + +install: + if test '$(sounds_DATA)'; then \ + mkdir -p $(soundsdir); \ + cp $(sounds_DATA) $(soundsdir); \ + fi; +