===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/server-window.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/Attic/server-window.c	2012/06/18 10:58:44	1.24
--- src/usr.bin/tmux/Attic/server-window.c	2012/07/08 07:27:32	1.25
***************
*** 1,4 ****
! /* $OpenBSD: server-window.c,v 1.24 2012/06/18 10:58:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-window.c,v 1.25 2012/07/08 07:27:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 56,64 ****
  				server_status_session(s);
  			TAILQ_FOREACH(wp, &w->panes, entry)
  				server_window_check_content(s, wl, wp);
- 
- 			if (!(s->flags & SESSION_UNATTACHED))
- 				w->flags &= ~(WINDOW_BELL|WINDOW_ACTIVITY);
  		}
  	}
  }
--- 56,61 ----
***************
*** 78,83 ****
--- 75,82 ----
  		wl->flags |= WINLINK_BELL;
  	if (s->flags & SESSION_UNATTACHED)
  		return (1);
+ 	if (s->curw->window == wl->window)
+ 		w->flags &= ~WINDOW_BELL;
  
  	visual = options_get_number(&s->options, "visual-bell");
  	action = options_get_number(&s->options, "bell-action");
***************
*** 108,113 ****
--- 107,115 ----
  	struct window	*w = wl->window;
  	u_int		 i;
  
+ 	if (s->curw->window == wl->window)
+ 		w->flags &= ~WINDOW_ACTIVITY;
+ 
  	if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_ACTIVITY)
  		return (0);
  	if (s->curw == wl && !(s->flags & SESSION_UNATTACHED))
***************
*** 196,201 ****
--- 198,206 ----
  	char		*found, *ptr;
  
  	/* Activity flag must be set for new content. */
+ 	if (s->curw->window == w)
+ 		w->flags &= ~WINDOW_ACTIVITY;
+ 
  	if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_CONTENT)
  		return (0);
  	if (s->curw == wl && !(s->flags & SESSION_UNATTACHED))