===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -c -r1.74 -r1.75
*** src/usr.bin/tmux/server-fn.c	2013/10/10 12:26:36	1.74
--- src/usr.bin/tmux/server-fn.c	2014/02/14 13:59:01	1.75
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.74 2013/10/10 12:26:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.75 2014/02/14 13:59:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 454,460 ****
  }
  
  void
! server_check_unattached (void)
  {
  	struct session	*s;
  
--- 454,460 ----
  }
  
  void
! server_check_unattached(void)
  {
  	struct session	*s;
  
***************
*** 480,486 ****
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
! 	if (event_initialized (&c->identify_timer))
  		evtimer_del(&c->identify_timer);
  	evtimer_set(&c->identify_timer, server_callback_identify, c);
  	evtimer_add(&c->identify_timer, &tv);
--- 480,486 ----
  	tv.tv_sec = delay / 1000;
  	tv.tv_usec = (delay % 1000) * 1000L;
  
! 	if (event_initialized(&c->identify_timer))
  		evtimer_del(&c->identify_timer);
  	evtimer_set(&c->identify_timer, server_callback_identify, c);
  	evtimer_add(&c->identify_timer, &tv);
***************
*** 592,598 ****
  	c->references++;
  
  	if (c->stdin_closed)
! 		c->stdin_callback (c, 1, c->stdin_callback_data);
  
  	server_write_client(c, MSG_STDIN, NULL, 0);
  
--- 592,598 ----
  	c->references++;
  
  	if (c->stdin_closed)
! 		c->stdin_callback(c, 1, c->stdin_callback_data);
  
  	server_write_client(c, MSG_STDIN, NULL, 0);