# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1099632403 0
# Node ID 5dd9c1df6459ac5ee14698f9ba78b6ce003d4d10
# Parent  0de7eee583e64b49505d01b31f79650b7b8a8144
[gaim-migrate @ 11239]
New default sounds from Brad Turcotte.  Thanks Brad!

If anyone has any opinions on these please discuss on gaim-devel.

It's possible they need to be made just a tad louder, but we
thought it'd be a good idea to try them as-is.

committer: Tailor Script <tailor@pidgin.im>

diff -r 0de7eee583e6 -r 5dd9c1df6459 COPYRIGHT
--- a/COPYRIGHT	Thu Nov 04 05:13:08 2004 +0000
+++ b/COPYRIGHT	Fri Nov 05 05:26:43 2004 +0000
@@ -169,6 +169,7 @@
 Bill Tompkins
 Tom Tromey
 Chris Toshok
+Brad Turcotte
 Junichi Uekawa
 István Váradi
 Philip Van Hoof
diff -r 0de7eee583e6 -r 5dd9c1df6459 ChangeLog
--- a/ChangeLog	Thu Nov 04 05:13:08 2004 +0000
+++ b/ChangeLog	Fri Nov 05 05:26:43 2004 +0000
@@ -5,9 +5,11 @@
 	* Insane rewrite of all code dealing with buddy and account status, away
 	  messages, away states, online/offline, etc.  Huge thanks to Christian,
 	  Dave West, and Daniel Atallah
+	* Beautiful new default sounds (Brad Turcotte)
 	* gaim-remote can send text (John B. Silvestri)
 	* Autoreconnect plugin can hide the reconnect dialog (François Gagné)
-	* Screenname colors in chats now come from GNOME color palette
+	* Screenname colors in chats now chosen intelligently from GNOME color
+	  palette
 	* Yahoo! has the following new "/" commands:  /join, /buzz
 	* Smiley selection dialog rewritten to look nicer (Nathan Fredrickson)
 
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/Makefile.am
--- a/sounds/Makefile.am	Thu Nov 04 05:13:08 2004 +0000
+++ b/sounds/Makefile.am	Fri Nov 05 05:26:43 2004 +0000
@@ -1,7 +1,8 @@
-EXTRA_DIST =	arrive.wav \
-		leave.wav \
+EXTRA_DIST = \
+		alert.wav \
+		login.wav \
+		logout.wav \
 		receive.wav \
-		redalert.wav \
 		send.wav
 
 soundsdir =	$(datadir)/sounds/gaim
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/alert.wav
Binary file sounds/alert.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/arrive.wav
Binary file sounds/arrive.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/leave.wav
Binary file sounds/leave.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/login.wav
Binary file sounds/login.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/logout.wav
Binary file sounds/logout.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/receive.wav
Binary file sounds/receive.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/redalert.wav
Binary file sounds/redalert.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 sounds/send.wav
Binary file sounds/send.wav has changed
diff -r 0de7eee583e6 -r 5dd9c1df6459 src/gtksound.c
--- a/src/gtksound.c	Thu Nov 04 05:13:08 2004 +0000
+++ b/src/gtksound.c	Fri Nov 05 05:26:43 2004 +0000
@@ -59,18 +59,18 @@
 static gboolean sound_initialized = FALSE;
 
 static struct gaim_sound_event sounds[GAIM_NUM_SOUNDS] = {
-	{N_("Buddy logs in"), "login", "arrive.wav"},
-	{N_("Buddy logs out"), "logout", "leave.wav"},
+	{N_("Buddy logs in"), "login", "login.wav"},
+	{N_("Buddy logs out"), "logout", "logout.wav"},
 	{N_("Message received"), "im_recv", "receive.wav"},
 	{N_("Message received begins conversation"), "first_im_recv", "receive.wav"},
 	{N_("Message sent"), "send_im", "send.wav"},
-	{N_("Person enters chat"), "join_chat", "arrive.wav"},
-	{N_("Person leaves chat"), "left_chat", "leave.wav"},
+	{N_("Person enters chat"), "join_chat", "login.wav"},
+	{N_("Person leaves chat"), "left_chat", "logout.wav"},
 	{N_("You talk in chat"), "send_chat_msg", "send.wav"},
 	{N_("Others talk in chat"), "chat_msg_recv", "receive.wav"},
 	/* this isn't a terminator, it's the buddy pounce default sound event ;-) */
-	{NULL, "pounce_default", "redalert.wav"},
-	{N_("Someone says your name in chat"), "nick_said", "redalert.wav"}
+	{NULL, "pounce_default", "alert.wav"},
+	{N_("Someone says your name in chat"), "nick_said", "alert.wav"}
 };
 
 #ifdef USE_AO