Merge remote-tracking branch 'gordon-quad/master'

https://github.com/haavard/tox-weechat/pull/11
This commit is contained in:
Håvard Pettersson 2017-02-07 22:57:58 -08:00
commit 9928d0b8ed
17 changed files with 515 additions and 285 deletions

View file

@ -42,6 +42,7 @@ char *twc_profile_option_names[TWC_PROFILE_NUM_OPTIONS] =
{
"save_file",
"autoload",
"autojoin",
"max_friend_requests",
"proxy_address",
"proxy_port",
@ -198,6 +199,12 @@ twc_config_init_option(struct t_config_section *section,
"network when WeeChat starts";
default_value = "off";
break;
case TWC_PROFILE_OPTION_AUTOJOIN:
type = "boolean";
description = "automatically join all groups you are invited in "
"by your friends";
default_value = "off";
break;
case TWC_PROFILE_OPTION_IPV6:
type = "boolean";
description = "use IPv6 as well as IPv4 to connect to the Tox "