Mirrors/hexchat
1
0
Fork 0
mirror of https://github.com/hexchat/hexchat.git synced 2024-11-06 11:12:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added preferences options to enable the server-time extension when available.

Browse Source 
(Internationalization messages missing.)
This commit is contained in:
Diogo Sousa 2013-06-24 20:13:18 +01:00
parent aef9e3922e
commit dcdb11a78b
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cfgfiles.c
View File

@ -507,6 +507,7 @@ const struct prefs vars[] =
{"irc_auto_rejoin", P_OFFINT (hex_irc_auto_rejoin), TYPE_BOOL}, {"irc_auto_rejoin", P_OFFINT (hex_irc_auto_rejoin), TYPE_BOOL},
{"irc_ban_type", P_OFFINT (hex_irc_ban_type), TYPE_INT}, {"irc_ban_type", P_OFFINT (hex_irc_ban_type), TYPE_INT},
{"irc_cap_server_time", P_OFFINT (hex_irc_cap_server_time), TYPE_BOOL},
{"irc_conf_mode", P_OFFINT (hex_irc_conf_mode), TYPE_BOOL}, {"irc_conf_mode", P_OFFINT (hex_irc_conf_mode), TYPE_BOOL},
{"irc_extra_hilight", P_OFFSET (hex_irc_extra_hilight), TYPE_STR}, {"irc_extra_hilight", P_OFFSET (hex_irc_extra_hilight), TYPE_STR},
{"irc_hide_version", P_OFFINT (hex_irc_hide_version), TYPE_BOOL}, {"irc_hide_version", P_OFFINT (hex_irc_hide_version), TYPE_BOOL},
@ -748,6 +749,7 @@ load_default_config(void)
prefs.hex_text_thin_sep = 1; prefs.hex_text_thin_sep = 1;
prefs.hex_text_wordwrap = 1; prefs.hex_text_wordwrap = 1;
prefs.hex_url_grabber = 1; prefs.hex_url_grabber = 1;
prefs.hex_irc_cap_server_time = 0;
/* NUMBERS */ /* NUMBERS */
prefs.hex_away_size_max = 300; prefs.hex_away_size_max = 300;

1
src/common/hexchat.h
View File

@ -215,6 +215,7 @@ struct hexchatprefs
unsigned int hex_irc_wallops; unsigned int hex_irc_wallops;
unsigned int hex_irc_who_join; unsigned int hex_irc_who_join;
unsigned int hex_irc_whois_front; unsigned int hex_irc_whois_front;
unsigned int hex_irc_cap_server_time;
unsigned int hex_net_auto_reconnect; unsigned int hex_net_auto_reconnect;
unsigned int hex_net_auto_reconnectonfail; unsigned int hex_net_auto_reconnectonfail;
unsigned int hex_net_proxy_auth; unsigned int hex_net_proxy_auth;

10
src/common/inbound.c
View File

@ -1665,14 +1665,12 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
*/ */
if (!strcmp (extension, "znc.in/server-time")) if (!strcmp (extension, "znc.in/server-time"))
{ {
strcat (buffer, "znc.in/server-time"); strcat (buffer, "znc.in/server-time ");
strcat (buffer, " ");
} }
else if (!strcmp (extension, "server-time")) if (prefs.hex_irc_cap_server_time
&& !strcmp (extension, "server-time"))
{ {
/* ignore. it is best to have server-time explicitly enabled or have strcat (buffer, "server-time ");
* a option in the preferences (or per server).
*/
} }
/* if the SASL password is set AND auth mode is set to SASL, request SASL auth */ /* if the SASL password is set AND auth mode is set to SASL, request SASL auth */

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

@ -522,12 +522,13 @@ static const setting advanced_settings[] =
"Otherwise, include color information if the CONTROL key is held down " "Otherwise, include color information if the CONTROL key is held down "
"while selecting."), 0, 0}, "while selecting."), 0, 0},
{ST_HEADER, N_("Miscellaneous"),0,0,0}, {ST_HEADER, N_("Miscellaneous"), 0, 0, 0},
{ST_ENTRY, N_("Real name:"), P_OFFSETNL(hex_irc_real_name), 0, 0, sizeof prefs.hex_irc_real_name}, {ST_ENTRY, N_("Real name:"), P_OFFSETNL(hex_irc_real_name), 0, 0, sizeof prefs.hex_irc_real_name},
#ifdef WIN32 #ifdef WIN32
{ST_ENTRY, N_("Alternative fonts:"), P_OFFSETNL(hex_text_font_alternative), "Separate multiple entries with commas without spaces before or after.", 0, sizeof prefs.hex_text_font_alternative}, {ST_ENTRY, N_("Alternative fonts:"), P_OFFSETNL(hex_text_font_alternative), N_("Separate multiple entries with commas without spaces before or after."), 0, sizeof prefs.hex_text_font_alternative},
#endif #endif
{ST_TOGGLE, N_("Display lists in compact mode"), P_OFFINTNL(hex_gui_compact), N_("Use less spacing between user list/channel tree rows."), 0, 0}, {ST_TOGGLE, N_("Display lists in compact mode"), P_OFFINTNL(hex_gui_compact), N_("Use less spacing between user list/channel tree rows."), 0, 0},
{ST_TOGGLE, N_("Use server time if supported"), P_OFFINTNL(hex_irc_cap_server_time), N_("Display timestamps obtained from server if it supports the time-server extension."), 0, 0},
{ST_TOGGLE, N_("Automatically reconnect to servers on disconnect"), P_OFFINTNL(hex_net_auto_reconnect), 0, 0, 1}, {ST_TOGGLE, N_("Automatically reconnect to servers on disconnect"), P_OFFINTNL(hex_net_auto_reconnect), 0, 0, 1},
{ST_NUMBER, N_("Auto reconnect delay:"), P_OFFINTNL(hex_net_reconnect_delay), 0, 0, 9999}, {ST_NUMBER, N_("Auto reconnect delay:"), P_OFFINTNL(hex_net_reconnect_delay), 0, 0, 9999},
{ST_NUMBER, N_("Auto join delay:"), P_OFFINTNL(hex_irc_join_delay), 0, 0, 9999}, {ST_NUMBER, N_("Auto join delay:"), P_OFFINTNL(hex_irc_join_delay), 0, 0, 9999},