aboutsummaryrefslogtreecommitdiff
path: root/cmd-choose-tree.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-16 22:01:14 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-16 22:01:14 +0100
commit1a6e696b08113ca17ee8e881844167cf94276846 (patch)
tree60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-choose-tree.c
parentd401340c516131ae8e07bfb978b670347486d077 (diff)
parentd15d54c2c8e6b95695169442eb2a27d814efc078 (diff)
downloadrtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz
rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2
rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-choose-tree.c')
-rw-r--r--cmd-choose-tree.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 13bbe2a7..65d55407 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -41,7 +41,7 @@
"#{window_index}: #{window_name}#{window_flags} " \
"\"#{pane_title}\""
-static enum cmd_retval cmd_choose_tree_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval cmd_choose_tree_exec(struct cmd *, struct cmdq_item *);
const struct cmd_entry cmd_choose_tree_entry = {
.name = "choose-tree",
@@ -84,12 +84,12 @@ const struct cmd_entry cmd_choose_window_entry = {
};
static enum cmd_retval
-cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_choose_tree_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
- struct client *c = cmdq->state.c;
- struct winlink *wl = cmdq->state.tflag.wl, *wm;
- struct session *s = cmdq->state.tflag.s, *s2;
+ struct client *c = item->state.c;
+ struct winlink *wl = item->state.tflag.wl, *wm;
+ struct session *s = item->state.tflag.s, *s2;
struct window_choose_data *wcd = NULL;
const char *ses_template, *win_template;
char *final_win_action, *cur_win_template;
@@ -103,7 +103,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
ses_action = win_action = NULL;
if (c == NULL) {
- cmdq_error(cmdq, "no client available");
+ cmdq_error(item, "no client available");
return (CMD_RETURN_ERROR);
}