diff options
| author | Berke Viktor <berkeviktor@aol.com> | 2012-05-04 19:23:07 +0200 |
|---|---|---|
| committer | Berke Viktor <berkeviktor@aol.com> | 2012-05-04 19:23:07 +0200 |
| commit | eeed2c3da0824e2d460d32adf7d9e24796248f5a (patch) | |
| tree | 7445bb304b41773eb40c5c18596ad0eacfd3ccf7 | |
| parent | 3c983b106b091565ca9cbda41769a20358cba53e (diff) | |
| parent | cba2e2e3608759ac9434d5c3e3c2629109a1ded8 (diff) | |
Merge branch 'master' into wdk
| -rw-r--r-- | plugins/perl/lib/Xchat.pod | 2 | ||||
| -rw-r--r-- | plugins/perl/xchat2-perl.html | 2 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/plugins/perl/lib/Xchat.pod b/plugins/perl/lib/Xchat.pod index 5b1bc201..fff2cba9 100644 --- a/plugins/perl/lib/Xchat.pod +++ b/plugins/perl/lib/Xchat.pod @@ -869,6 +869,8 @@ if( Xchat::context_info->{flags} & (1 << 6) ) { 1 - server<br /> 2 - channel<br /> 3 - dialog<br /> + 4 - notices<br /> + 5 - server notices<br /> </td> </tr> diff --git a/plugins/perl/xchat2-perl.html b/plugins/perl/xchat2-perl.html index d555594e..65a0b6d4 100644 --- a/plugins/perl/xchat2-perl.html +++ b/plugins/perl/xchat2-perl.html @@ -806,6 +806,8 @@ if there is no such list.</p> 1 - server<br /> 2 - channel<br /> 3 - dialog<br /> + 4 - notices<br /> + 5 - server notices<br /> </td> </tr> <tr> <td>users</td> <td>Number of users in this channel</td> 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; |