# HG changeset patch
# User Eric Polino <aluink@pidgin.im>
# Date 1182803256 0
# Node ID 4c26b23e7859db9de6ba36229ce74faace919547
# Parent  6de2e9ba093024738b003cb7b803afb21bf6c3f5
Moved:
  $datadir/sounds/pidgin -> $datadir/sounds/purple

Pidgin and Finch both use $datadir/sounds/purple for their sound files.

diff -r 6de2e9ba0930 -r 4c26b23e7859 Makefile.am
--- 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
diff -r 6de2e9ba0930 -r 4c26b23e7859 configure.ac
--- 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
diff -r 6de2e9ba0930 -r 4c26b23e7859 finch/gntsound.c
--- 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);
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/Makefile.am
--- 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
 
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/gtksound.c
--- 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);
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/Makefile.am
--- 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)
-
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/Makefile.mingw
--- 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;
-
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/alert.wav
Binary file pidgin/sounds/alert.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/login.wav
Binary file pidgin/sounds/login.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/logout.wav
Binary file pidgin/sounds/logout.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/receive.wav
Binary file pidgin/sounds/receive.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 pidgin/sounds/send.wav
Binary file pidgin/sounds/send.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/Makefile.am
--- /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
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/Makefile.am
--- /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)
+
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/Makefile.mingw
--- /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;
+
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/alert.wav
Binary file share/sounds/alert.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/login.wav
Binary file share/sounds/login.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/logout.wav
Binary file share/sounds/logout.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/receive.wav
Binary file share/sounds/receive.wav has changed
diff -r 6de2e9ba0930 -r 4c26b23e7859 share/sounds/send.wav
Binary file share/sounds/send.wav has changed