emdee/tox-weechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed proxy_enabled option in favor of proxy_type.

Browse Source
This commit is contained in:
Håvard Pettersson
2015-01-04 14:56:05 +01:00
parent 30677fdd7a
commit dde3ce9512
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/twc-profile.c
View File

@ -218,8 +218,22 @@ twc_profile_load(struct t_twc_profile *profile)
// create Tox options object
Tox_Options options;
options.proxy_enabled =
TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_PROXY_ENABLED);
char *proxy_type;
switch (TWC_PROFILE_OPTION_INTEGER(profile, TWC_PROFILE_OPTION_PROXY_TYPE))
{
case TWC_PROXY_NONE:
options.proxy_type = TOX_PROXY_NONE;
break;
case TWC_PROXY_SOCKS5:
options.proxy_type = TOX_PROXY_SOCKS5;
proxy_type = "SOCKS5";
break;
case TWC_PROXY_HTTP:
options.proxy_type = TOX_PROXY_HTTP;
proxy_type = "HTTP";
break;
}
const char *proxy_address =
TWC_PROFILE_OPTION_STRING(profile, TWC_PROFILE_OPTION_PROXY_ADDRESS);
@ -233,7 +247,7 @@ twc_profile_load(struct t_twc_profile *profile)
options.ipv6enabled =
TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_IPV6);
if (options.proxy_enabled)
if (options.proxy_type != TOX_PROXY_NONE)
{
if (!options.proxy_address || !options.proxy_port)
{
@ -246,8 +260,9 @@ twc_profile_load(struct t_twc_profile *profile)
else
{
weechat_printf(profile->buffer,
"%susing proxy %s:%d",
"%susing %s proxy %s:%d",
weechat_prefix("network"),
proxy_type,
options.proxy_address, options.proxy_port);
}
}