Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-12-28 14:01:14 +00:00
commit ad417f6eb7

View File

@ -200,8 +200,10 @@ alerts_check_bell(struct window *w)
* not check WINLINK_BELL). * not check WINLINK_BELL).
*/ */
s = wl->session; s = wl->session;
if (s->curw != wl) if (s->curw != wl) {
wl->flags |= WINLINK_BELL; wl->flags |= WINLINK_BELL;
server_status_session(s);
}
if (!alerts_action_applies(wl, "bell-action")) if (!alerts_action_applies(wl, "bell-action"))
continue; continue;
notify_winlink("alert-bell", wl); notify_winlink("alert-bell", wl);
@ -234,8 +236,10 @@ alerts_check_activity(struct window *w)
if (wl->flags & WINLINK_ACTIVITY) if (wl->flags & WINLINK_ACTIVITY)
continue; continue;
s = wl->session; s = wl->session;
if (s->curw != wl) if (s->curw != wl) {
wl->flags |= WINLINK_ACTIVITY; wl->flags |= WINLINK_ACTIVITY;
server_status_session(s);
}
if (!alerts_action_applies(wl, "activity-action")) if (!alerts_action_applies(wl, "activity-action"))
continue; continue;
notify_winlink("alert-activity", wl); notify_winlink("alert-activity", wl);
@ -268,8 +272,10 @@ alerts_check_silence(struct window *w)
if (wl->flags & WINLINK_SILENCE) if (wl->flags & WINLINK_SILENCE)
continue; continue;
s = wl->session; s = wl->session;
if (s->curw != wl) if (s->curw != wl) {
wl->flags |= WINLINK_SILENCE; wl->flags |= WINLINK_SILENCE;
server_status_session(s);
}
if (!alerts_action_applies(wl, "silence-action")) if (!alerts_action_applies(wl, "silence-action"))
continue; continue;
notify_winlink("alert-silence", wl); notify_winlink("alert-silence", wl);