===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find-window.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/tmux/cmd-find-window.c	2012/10/25 11:26:47	1.20
--- src/usr.bin/tmux/cmd-find-window.c	2013/03/21 16:08:24	1.21
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find-window.c,v 1.20 2012/10/25 11:26:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-find-window.c,v 1.21 2013/03/21 16:08:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,37 ****
  enum cmd_retval	 cmd_find_window_exec(struct cmd *, struct cmd_ctx *);
  
  void	cmd_find_window_callback(struct window_choose_data *);
- void	cmd_find_window_free(struct window_choose_data *);
  
  /* Flags for determining matching behavior. */
  #define CMD_FIND_WINDOW_BY_TITLE   0x1
--- 31,36 ----
***************
*** 131,136 ****
--- 130,136 ----
  cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args			*args = self->args;
+ 	struct client			*c;
  	struct window_choose_data	*cdata;
  	struct session			*s;
  	struct winlink			*wl, *wm;
***************
*** 143,149 ****
  		ctx->error(ctx, "must be run interactively");
  		return (CMD_RETURN_ERROR);
  	}
! 	s = ctx->curclient->session;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
  		return (CMD_RETURN_ERROR);
--- 143,150 ----
  		ctx->error(ctx, "must be run interactively");
  		return (CMD_RETURN_ERROR);
  	}
! 	c = ctx->curclient;
! 	s = c->session;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
  		return (CMD_RETURN_ERROR);
***************
*** 180,188 ****
  	for (i = 0; i < ARRAY_LENGTH(&find_list); i++) {
  		wm = ARRAY_ITEM(&find_list, i).wl;
  
! 		cdata = window_choose_data_create(ctx);
  		cdata->idx = wm->idx;
- 		cdata->client->references++;
  		cdata->wl = wm;
  
  		cdata->ft_template = xstrdup(template);
--- 181,188 ----
  	for (i = 0; i < ARRAY_LENGTH(&find_list); i++) {
  		wm = ARRAY_ITEM(&find_list, i).wl;
  
! 		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
  		cdata->idx = wm->idx;
  		cdata->wl = wm;
  
  		cdata->ft_template = xstrdup(template);
***************
*** 198,205 ****
  		window_choose_add(wl->window->active, cdata);
  	}
  
! 	window_choose_ready(wl->window->active,
! 	    0, cmd_find_window_callback, cmd_find_window_free);
  
  out:
  	ARRAY_FREE(&find_list);
--- 198,205 ----
  		window_choose_add(wl->window->active, cdata);
  	}
  
! 	window_choose_ready(wl->window->active, 0, cmd_find_window_callback,
! 	    NULL);
  
  out:
  	ARRAY_FREE(&find_list);
***************
*** 215,221 ****
  	if (cdata == NULL)
  		return;
  
! 	s = cdata->session;
  	if (!session_alive(s))
  		return;
  
--- 215,221 ----
  	if (cdata == NULL)
  		return;
  
! 	s = cdata->start_session;
  	if (!session_alive(s))
  		return;
  
***************
*** 227,243 ****
  		server_redraw_session(s);
  		recalculate_sizes();
  	}
- }
- 
- void
- cmd_find_window_free(struct window_choose_data *cdata)
- {
- 	if (cdata == NULL)
- 		return;
- 
- 	cdata->session->references--;
- 
- 	free(cdata->ft_template);
- 	format_free(cdata->ft);
- 	free(cdata);
  }
--- 227,230 ----