From 6dbd63ba4f2da666d55267692c610b9ed8d1d8dd Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 25 Apr 2015 18:09:28 +0000
Subject: Move the functions to convert ids from strings into session.c and
 window.c.

---
 cmd-switch-client.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'cmd-switch-client.c')

diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 8c4daf97..18de0eb1 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -99,10 +99,12 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		} else {
 			if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL)
 				return (CMD_RETURN_ERROR);
-			w = cmd_lookup_windowid(tflag);
-			if (w == NULL &&
-			    (wp = cmd_lookup_paneid(tflag)) != NULL)
-				w = wp->window;
+			w = window_find_by_id_str(tflag);
+			if (w == NULL) {
+				wp = window_pane_find_by_id_str(tflag);
+				if (wp != NULL)
+					w = wp->window;
+			}
 			if (w != NULL)
 				wl = winlink_find_by_window(&s->windows, w);
 		}
-- 
cgit v1.2.3