[Gaim-commits] CVS: gaim/src aim.c,1.176,1.177 browser.c,1.21,1.22 buddy.c,1.293,1.294 gaim.h,1.314,1.315 sound.c,1.52,1.53 util.c,1.113,1.114

[Rob F. <rob...@us...>]

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

Modified Files:
	aim.c browser.c buddy.c gaim.h sound.c util.c 
Log Message:
CLeaner PID stuff. Thanks, BMIller :)



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- aim.c	2 Mar 2002 04:52:20 -0000	1.176
+++ aim.c	17 Mar 2002 22:23:17 -0000	1.177
@@ -406,6 +406,9 @@
 #endif
 		abort();
 		break;
+	case SIGCHLD:
+		clean_pid();
+		break;
 	default:
 		debug_printf("caught signal %d\n", sig);
 		gtkspell_stop();
@@ -576,6 +579,7 @@
 	signal(SIGTERM, sighandler);
 	signal(SIGQUIT, sighandler);
 	signal(SIGPIPE, SIG_IGN);
+	signal(SIGCHLD, sighandler);
 #endif
 
 

Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- browser.c	2 Dec 2001 00:47:33 -0000	1.21
+++ browser.c	17 Mar 2002 22:23:17 -0000	1.22
@@ -499,8 +499,6 @@
 		if (status != 6)
 			mozilla_remote_free_lock(window);
 
-		gtk_timeout_add(1000, (GtkFunction)clean_pid, NULL);
-
 		netscape_lock = 0;
 
 		g_free(msg);
@@ -612,8 +610,6 @@
 
 			execvp(args[0], args);
 			_exit(0);
-		} else {
-			gtk_timeout_add(1000, (GtkFunction)clean_pid, NULL);
 		}
 	}
 }

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- buddy.c	16 Mar 2002 20:14:24 -0000	1.293
+++ buddy.c	17 Mar 2002 22:23:18 -0000	1.294
@@ -1551,8 +1551,6 @@
 					args[3] = NULL;
 					execvp(args[0], args);
 					_exit(0);
-				} else if (pid > 0) {
-					gtk_timeout_add(100, (GtkFunction)clean_pid, NULL);
 				}
 			}
 			if (b->options & OPT_POUNCE_SOUND) {

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- gaim.h	16 Mar 2002 00:32:53 -0000	1.314
+++ gaim.h	17 Mar 2002 22:23:18 -0000	1.315
@@ -399,7 +399,7 @@
 extern char *normalize(const char *);
 extern char *tobase64(const char *);
 extern void frombase64(const char *, char **, int *);
-extern gint clean_pid(gpointer);
+extern void clean_pid();
 extern char *date();
 extern gint linkify_text(char *);
 extern FILE *open_log_file (char *);

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- sound.c	17 Mar 2002 18:29:17 -0000	1.52
+++ sound.c	17 Mar 2002 22:23:18 -0000	1.53
@@ -463,8 +463,6 @@
 		}
 
 		_exit(0);
-	} else {
-		g_timeout_add(100, clean_pid, NULL);
 	}
 }
 
@@ -533,8 +531,6 @@
 		}
 
 		_exit(0);
-	} else {
-		g_timeout_add(100, clean_pid, NULL);
 	}
 }
 

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- util.c	17 Feb 2002 18:08:12 -0000	1.113
+++ util.c	17 Mar 2002 22:23:18 -0000	1.114
@@ -613,17 +613,13 @@
 }
 
 
-gboolean clean_pid(gpointer dummy)
+void clean_pid(void)
 {
 	int status;
 	pid_t pid;
 
+	printf ("clean_pid\n");
 	pid = waitpid(-1, &status, WNOHANG);
-
-	if (pid == 0)
-		return TRUE;
-
-	return FALSE;
 }
 
 struct aim_user *find_user(const char *name, int protocol)