moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into wdk

This commit is contained in:
Berke Viktor 2012-05-04 19:23:07 +02:00
parent 3c983b106b cba2e2e360
commit eeed2c3da0
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/perl/lib/Xchat.pod
View File

@ -869,6 +869,8 @@ if( Xchat::context_info->{flags} &amp; (1 << 6) ) {
1 - server<br /> 1 - server<br />
2 - channel<br /> 2 - channel<br />
3 - dialog<br /> 3 - dialog<br />
4 - notices<br />
5 - server notices<br />
</td> </td>
</tr> </tr>

2
plugins/perl/xchat2-perl.html
View File

@ -806,6 +806,8 @@ if there is no such list.</p>
1 - server<br /> 1 - server<br />
2 - channel<br /> 2 - channel<br />
3 - dialog<br /> 3 - dialog<br />
4 - notices<br />
5 - server notices<br />
</td> </td>
</tr> <tr> </tr> <tr>
<td>users</td> <td>Number of users in this channel</td> <td>users</td> <td>Number of users in this channel</td>

5
src/fe-gtk/maingui.c
View File

@ -265,7 +265,8 @@ fe_set_tab_color (struct session *sess, int col)
sess->nick_said = FALSE; sess->nick_said = FALSE;
chan_set_color (sess->res->tab, newdata_list); 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->new_data = TRUE;
server_sess->msg_said = FALSE; server_sess->msg_said = FALSE;
@ -280,7 +281,7 @@ fe_set_tab_color (struct session *sess, int col)
sess->nick_said = FALSE; sess->nick_said = FALSE;
chan_set_color (sess->res->tab, newmsg_list); 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->new_data = FALSE;
server_sess->msg_said = TRUE; server_sess->msg_said = TRUE;