Move the functions to convert ids from strings into session.c and window.c.

1 files changed, 6 insertions, 4 deletions

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);
 		}