# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 967506449 0
# Node ID 9614e69f68ca4ff2d2e545bafc28d8e1e161552c
# Parent  b61607d6c2afb4086ed5c2e9370cb27a77e0f199
[gaim-migrate @ 785]
beep beep m beep beep m yeah!

committer: Tailor Script <tailor@pidgin.im>

diff -r b61607d6c2af -r 9614e69f68ca ChangeLog
--- a/ChangeLog	Mon Aug 28 18:49:17 2000 +0000
+++ b/ChangeLog	Mon Aug 28 23:47:29 2000 +0000
@@ -23,6 +23,7 @@
 	* Added GNOME Url Handler as an available web-browser 
 	* Added the S html tag. 		
 	* Optionally Ignore TiK's Automated Messages
+	* Option to beep instead of play sound
 
 version 0.9.20 (07/14/2000):
 	* More plugin events, more plugin features
diff -r b61607d6c2af -r 9614e69f68ca TODO
--- a/TODO	Mon Aug 28 18:49:17 2000 +0000
+++ b/TODO	Mon Aug 28 23:47:29 2000 +0000
@@ -1,6 +1,4 @@
 --- STUFF FOR 0.10.1 RELEASE ---
-	Third sound option for people without soundcards who still want
-		sound events.  Make a PC Speaker Beep (^G / Char 7)
 	Execute Command on Buddy Pounce
 	Redesign the Foreground/Background color options under preferences.
 	Add ability to conersaton window to allow changing of foreground/
diff -r b61607d6c2af -r 9614e69f68ca plugins/ChangeLog
--- a/plugins/ChangeLog	Mon Aug 28 18:49:17 2000 +0000
+++ b/plugins/ChangeLog	Mon Aug 28 23:47:29 2000 +0000
@@ -4,7 +4,7 @@
 	problems that creates, the plugins now have the same CFLAGS and LIBS.
 	The plugins also have PLUGIN_LIBS which can be passed at make time.
 	This makes things like #ifdef USE_APPLET and #ifdef USE_PERL much more
-	reliable.
+	reliable. (#include "config.h" in order to get all the #defines)
 
 version 0.9.20:
 	It's 3 am the night before finals, it's obviously a good time to hack
diff -r b61607d6c2af -r 9614e69f68ca src/prefs.c
--- a/src/prefs.c	Mon Aug 28 18:49:17 2000 +0000
+++ b/src/prefs.c	Mon Aug 28 23:47:29 2000 +0000
@@ -1079,6 +1079,7 @@
 #endif
 	gaim_button(_("No sounds when you log in"), &sound_options, OPT_SOUND_SILENT_SIGNON, box);
 	gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, box);
+	gaim_button(_("Beep instead of playing sound"), &sound_options, OPT_SOUND_BEEP, box);
 
 	gtk_widget_show(prefdialog);
 }
diff -r b61607d6c2af -r 9614e69f68ca src/sound.c
--- a/src/sound.c	Mon Aug 28 18:49:17 2000 +0000
+++ b/src/sound.c	Mon Aug 28 23:47:29 2000 +0000
@@ -242,6 +242,11 @@
 	if (pid < 0)
 		return;
         else if (pid == 0) {
+		if (sound_options & OPT_SOUND_BEEP) {
+			gdk_beep();
+			_exit(0);
+		}
+
 #ifdef ESD_SOUND
                 /* ESD is our player of choice.  Are we OK to
                  * go there? */