[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.99,1.100 sound.c,1.46,1.47

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29075/src

Modified Files:
	gtkimhtml.c sound.c 
Log Message:
Don't fork for console beeps anymore.
Fixed a bug reported by Mike Owens.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- gtkimhtml.c	4 Mar 2002 03:04:48 -0000	1.99
+++ gtkimhtml.c	4 Mar 2002 18:43:27 -0000	1.100
@@ -2898,7 +2898,7 @@
 		*length = 5;
 	} else if (*(string + 1) == '#') {
 		guint pound = 0;
-		if (sscanf (string, "&#%u;", &pound) == 1) {
+		if ((sscanf (string, "&#%u;", &pound) == 1) && pound != 0) {
 			if (*(string + 3 + (gint)log10 (pound)) != ';')
 				return FALSE;
 			*replace = (gchar)pound;

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sound.c	3 Mar 2002 02:53:46 -0000	1.46
+++ sound.c	4 Mar 2002 18:43:27 -0000	1.47
@@ -391,17 +391,18 @@
 	return;
 #endif
 
+	if (sound_options & OPT_SOUND_BEEP) {
+		gdk_beep();
+		return;
+	}
+
 	pid = fork();
 
 	if (pid < 0)
 		return;
 	else if (pid == 0) {
 		alarm(30);
-		if (sound_options & OPT_SOUND_BEEP) {
-			gdk_beep();
-			_exit(0);
-		}
-
+		
 		if (sound_cmd[0]) {
 			char *args[4];
 			char command[4096];
@@ -455,20 +456,21 @@
 	return;
 #endif
 
+	if (sound_options & OPT_SOUND_BEEP) {
+		gdk_beep();
+		return;
+	}
 	pid = fork();
-
+	
 	if (pid < 0)
 		return;
 	else if (pid == 0) {
 		alarm(30);
-		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? */
-		else if (sound_options & OPT_SOUND_ESD) {
+		if (sound_options & OPT_SOUND_ESD) {
 			if (can_play_esd()) {
 				if (play_esd(data, size))
 					_exit(0);