===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/server.c	2009/06/26 22:12:19	1.5
--- src/usr.bin/tmux/server.c	2009/07/07 19:49:19	1.6
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.5 2009/06/26 22:12:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.6 2009/07/07 19:49:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 373,380 ****
  	unlink(socket_path);
  	xfree(socket_path);
  
! 	options_free(&global_options);
! 	options_free(&global_window_options);
  	if (server_password != NULL)
  		xfree(server_password);
  
--- 373,380 ----
  	unlink(socket_path);
  	xfree(socket_path);
  
! 	options_free(&global_s_options);
! 	options_free(&global_w_options);
  	if (server_password != NULL)
  		xfree(server_password);
  
***************
*** 573,582 ****
  	yy = c->tty.sy - 1;
  	if (xx == 0 || yy == 0)
  		return;
! 	colour = options_get_number(
! 	    &global_window_options, "clock-mode-colour");
! 	style = options_get_number(
! 	    &global_window_options, "clock-mode-style");
  
  	screen_init(&screen, xx, yy, 0);
  
--- 573,580 ----
  	yy = c->tty.sy - 1;
  	if (xx == 0 || yy == 0)
  		return;
! 	colour = options_get_number(&global_w_options, "clock-mode-colour");
! 	style = options_get_number(&global_w_options, "clock-mode-style");
  
  	screen_init(&screen, xx, yy, 0);
  
***************
*** 1062,1068 ****
  	time_t		 	 t;
  
  	t = time(NULL);
! 	xtimeout = options_get_number(&global_options, "lock-after-time");
  	if (xtimeout > 0 && t > server_activity + xtimeout)
  		server_lock();
  
--- 1060,1066 ----
  	time_t		 	 t;
  
  	t = time(NULL);
! 	xtimeout = options_get_number(&global_s_options, "lock-after-time");
  	if (xtimeout > 0 && t > server_activity + xtimeout)
  		server_lock();