summary refs log tree commit diff stats
path: root/src/fe-gtk/maingui.c
diff options
context:
space:
mode:
authorBerke Viktor <berkeviktor@aol.com>2012-05-04 19:23:07 +0200
committerBerke Viktor <berkeviktor@aol.com>2012-05-04 19:23:07 +0200
commiteeed2c3da0824e2d460d32adf7d9e24796248f5a (patch)
tree7445bb304b41773eb40c5c18596ad0eacfd3ccf7 /src/fe-gtk/maingui.c
parent3c983b106b091565ca9cbda41769a20358cba53e (diff)
parentcba2e2e3608759ac9434d5c3e3c2629109a1ded8 (diff)
Merge branch 'master' into wdk
Diffstat (limited to 'src/fe-gtk/maingui.c')
-rw-r--r--src/fe-gtk/maingui.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 28cf46a9..31f9fbc5 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -265,7 +265,8 @@ fe_set_tab_color (struct session *sess, int col)
 			sess->nick_said = FALSE;
 			chan_set_color (sess->res->tab, newdata_list);
 
-			if (chan_is_collapsed (sess->res->tab))
+			if (chan_is_collapsed (sess->res->tab)
+				&& !(server_sess->msg_said || server_sess->nick_said))
 			{
 				server_sess->new_data = TRUE;
 				server_sess->msg_said = FALSE;
@@ -280,7 +281,7 @@ fe_set_tab_color (struct session *sess, int col)
 			sess->nick_said = FALSE;
 			chan_set_color (sess->res->tab, newmsg_list);
 			
-			if (chan_is_collapsed (sess->res->tab))
+			if (chan_is_collapsed (sess->res->tab) && !server_sess->nick_said)
 			{
 				server_sess->new_data = FALSE;
 				server_sess->msg_said = TRUE;