diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-06-22 23:26:18 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-06-22 23:26:18 +0000 |
| commit | 47b335dee7e794135e03cc0f5806483e55572b9f (patch) | |
| tree | 39d927f0bd705e3630c9b23aff1e6f575fcce121 /server-fn.c | |
| parent | 6c767242016a1288cf412cfcf4aff68ebec2714a (diff) | |
Sync OpenBSD patchset 724:
Having a list of winlinks->alerts for each session is stupid, just store
the alert flags directly in the winlink itself.
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server-fn.c b/server-fn.c index 63280bd8..f95fcf3f 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.105 2010-04-18 15:10:55 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.106 2010-06-22 23:26:18 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -184,7 +184,7 @@ server_status_window(struct window *w) for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { s = ARRAY_ITEM(&sessions, i); - if (s != NULL && session_has(s, w)) + if (s != NULL && session_has(s, w) != NULL) server_status_session(s); } } @@ -249,7 +249,7 @@ server_kill_window(struct window *w) for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { s = ARRAY_ITEM(&sessions, i); - if (s == NULL || !session_has(s, w)) + if (s == NULL || session_has(s, w) == NULL) continue; while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) { if (session_detach(s, wl)) { @@ -286,7 +286,7 @@ server_link_window(struct session *src, struct winlink *srcwl, * Can't use session_detach as it will destroy session * if this makes it empty. */ - session_alert_cancel(dst, dstwl); + dstwl->flags &= ~WINLINK_ALERTFLAGS; winlink_stack_remove(&dst->lastw, dstwl); winlink_remove(&dst->windows, dstwl); |