From efaf4c16cf9fafa940dfe16ec48ca4ff68082b47 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 21 Apr 2017 20:26:34 +0000 Subject: Make the cmd_find_* functions more obvious when looking for a client, rather than having it inside other functions. Should be no change to the way targets are resolved just yet. --- notify.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'notify.c') diff --git a/notify.c b/notify.c index 446e71e7..a338c57c 100644 --- a/notify.c +++ b/notify.c @@ -44,9 +44,9 @@ notify_hook(struct cmdq_item *item, struct notify_entry *ne) struct session *s = ne->session; struct window *w = ne->window; - cmd_find_clear_state(&fs, NULL, 0); + cmd_find_clear_state(&fs, 0); if (cmd_find_empty_state(&ne->fs) || !cmd_find_valid_state(&ne->fs)) - cmd_find_current(&fs, item, CMD_FIND_QUIET); + cmd_find_from_nothing(&fs); else cmd_find_copy_state(&fs, &ne->fs); @@ -164,10 +164,7 @@ notify_client(const char *name, struct client *c) { struct cmd_find_state fs; - if (c->session != NULL) - cmd_find_from_session(&fs, c->session); - else - cmd_find_current(&fs, NULL, CMD_FIND_QUIET); + cmd_find_from_client(&fs, c); notify_add(name, &fs, c, NULL, NULL, NULL); } @@ -179,7 +176,7 @@ notify_session(const char *name, struct session *s) if (session_alive(s)) cmd_find_from_session(&fs, s); else - cmd_find_current(&fs, NULL, CMD_FIND_QUIET); + cmd_find_from_nothing(&fs); notify_add(name, &fs, NULL, s, NULL, NULL); } -- cgit v1.2.3