Mercurial > pidgin3 / file diff

--- a/src/conversation.c	Thu Oct 24 15:06:24 2002 +0000
+++ b/src/conversation.c	Fri Oct 25 02:50:59 2002 +0000
@@ -1808,7 +1808,7 @@
 	char buf2[BUF_LONG];
 	char mdate[64];
 	int unhighlight = 0;
-	
+
 	if (c->is_chat && (!c->gc || !g_slist_find(c->gc->buddy_chats, c)))
 		return;
 
@@ -2042,7 +2042,7 @@
 		return;
 	if (!(flags & WFLAG_RECV) && !(flags & WFLAG_SYSTEM))
 		return;
-	if ((c->unseen == 2) || ((c->unseen == 1) && !(flags & WFLAG_NICK)))
+	if (im_options & OPT_IM_ONE_WINDOW && ((c->unseen == 2) || ((c->unseen == 1) && !(flags & WFLAG_NICK))))
 		return;
 
 	if (flags & WFLAG_RECV)