===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- src/usr.bin/tmux/server.c	2009/10/10 15:03:01	1.49
+++ src/usr.bin/tmux/server.c	2009/10/10 18:42:14	1.50
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.49 2009/10/10 15:03:01 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.50 2009/10/10 18:42:14 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -73,9 +73,7 @@
 void		 server_fill_clients(void);
 void		 server_handle_clients(void);
 void		 server_fill_jobs(void);
-void		 server_fill_jobs1(struct jobs *);
 void		 server_handle_jobs(void);
-void		 server_handle_jobs1(struct jobs *);
 void		 server_accept_client(int);
 void		 server_handle_client(struct client *);
 void		 server_handle_window(struct window *, struct window_pane *);
@@ -414,11 +412,7 @@
 		/* Set window names. */
 		set_window_names();
 
-		/*
-		 * Handle window and client sockets. Clients can create
-		 * windows, so windows must come first to avoid messing up by
-		 * increasing the array size.
-		 */
+		/* Handle window and client sockets. */
 		server_handle_jobs();
 		server_handle_windows();
 		server_handle_clients();
@@ -764,22 +758,9 @@
 void
 server_fill_jobs(void)
 {
- 	struct client	*c;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL)
-			server_fill_jobs1(&c->status_jobs);
-	}
-}
-
-void
-server_fill_jobs1(struct jobs *jobs)
-{
 	struct job	*job;
 
-	RB_FOREACH(job, jobs, jobs) {
+	SLIST_FOREACH(job, &all_jobs, lentry) {
 		if (job->fd == -1)
 			continue;
 		server_poll_add(job->fd, POLLIN);
@@ -790,23 +771,10 @@
 void
 server_handle_jobs(void)
 {
-	struct client	*c;
-	u_int		 i;
-	
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL)
-			server_handle_jobs1(&c->status_jobs);
-	}
-}
-
-void
-server_handle_jobs1(struct jobs *jobs)
-{
 	struct job	*job;
 	struct pollfd	*pfd;
 
-	RB_FOREACH(job, jobs, jobs) {
+	SLIST_FOREACH(job, &all_jobs, lentry) {
 		if (job->fd == -1)
 			continue;
 		if ((pfd = server_poll_lookup(job->fd)) == NULL)