diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-02-14 13:55:16 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-02-14 13:55:16 +0000 |
| commit | 02e04477de73d01bb3ef12cb43a03cfc4c2e546c (patch) | |
| tree | 0c9d44339d22b35be7cd400f0a2dc2fb4b6e3779 /server-fn.c | |
| parent | c75cced07dea605b43c52375fdcc7a7bfc515ef8 (diff) | |
| parent | 4c2a78029d0cb307899be42d94d3c255b97fb15f (diff) | |
| download | rtmux-02e04477de73d01bb3ef12cb43a03cfc4c2e546c.tar.gz rtmux-02e04477de73d01bb3ef12cb43a03cfc4c2e546c.tar.bz2 rtmux-02e04477de73d01bb3ef12cb43a03cfc4c2e546c.zip | |
Merge branch 'obsd-master'
Conflicts:
server.c
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server-fn.c b/server-fn.c index 6e629ccf..ef348f8a 100644 --- a/server-fn.c +++ b/server-fn.c @@ -76,7 +76,7 @@ server_redraw_session_group(struct session *s) { struct session_group *sg; - if ((sg = session_group_find(s)) == NULL) + if ((sg = session_group_contains(s)) == NULL) server_redraw_session(s); else { TAILQ_FOREACH(s, &sg->sessions, gentry) @@ -100,7 +100,7 @@ server_status_session_group(struct session *s) { struct session_group *sg; - if ((sg = session_group_find(s)) == NULL) + if ((sg = session_group_contains(s)) == NULL) server_status_session(s); else { TAILQ_FOREACH(s, &sg->sessions, gentry) @@ -218,7 +218,7 @@ server_kill_window(struct window *w) } if (options_get_number(s->options, "renumber-windows")) { - if ((sg = session_group_find(s)) != NULL) { + if ((sg = session_group_contains(s)) != NULL) { TAILQ_FOREACH(target_s, &sg->sessions, gentry) session_renumber_windows(target_s); } else @@ -236,8 +236,8 @@ server_link_window(struct session *src, struct winlink *srcwl, struct winlink *dstwl; struct session_group *srcsg, *dstsg; - srcsg = session_group_find(src); - dstsg = session_group_find(dst); + srcsg = session_group_contains(src); + dstsg = session_group_contains(dst); if (src != dst && srcsg != NULL && dstsg != NULL && srcsg == dstsg) { xasprintf(cause, "sessions are grouped"); return (-1); @@ -349,7 +349,7 @@ server_destroy_session_group(struct session *s) struct session_group *sg; struct session *s1; - if ((sg = session_group_find(s)) == NULL) + if ((sg = session_group_contains(s)) == NULL) server_destroy_session(s); else { TAILQ_FOREACH_SAFE(s, &sg->sessions, gentry, s1) { |