diff --git a/src/twc-config.c b/src/twc-config.c index 255a2d7..28a78dc 100644 --- a/src/twc-config.c +++ b/src/twc-config.c @@ -40,8 +40,8 @@ char *twc_profile_option_names[TWC_PROFILE_NUM_OPTIONS] = "max_friend_requests", "proxy_address", "proxy_port", - "proxy_enabled", - "udp_disabled", + "proxy", + "udp", }; char *twc_profile_option_defaults[TWC_PROFILE_NUM_OPTIONS] = @@ -52,7 +52,7 @@ char *twc_profile_option_defaults[TWC_PROFILE_NUM_OPTIONS] = NULL, "0", "off", - "off", + "on", }; /** @@ -250,8 +250,8 @@ twc_config_init_option(int option_index, const char *option_name) return weechat_config_new_option( twc_config_file, twc_config_section_profile, option_name, "boolean", - "whether or not to proxy this profile; requires reload to " - "effect", + "use a proxy for communicating with the Tox network; requires " + "profile reload to take effect", NULL, 0, 0, twc_profile_option_defaults[option_index], NULL, 1, twc_config_profile_check_value_callback, (void *)(intptr_t)option_index, @@ -279,11 +279,11 @@ twc_config_init_option(int option_index, const char *option_name) twc_config_profile_check_value_callback, (void *)(intptr_t)option_index, twc_config_profile_change_callback, (void *)(intptr_t)option_index, NULL, NULL); - case TWC_PROFILE_OPTION_UDP_DISABLED: + case TWC_PROFILE_OPTION_UDP: return weechat_config_new_option( twc_config_file, twc_config_section_profile, option_name, "boolean", - "disable UDP; may be necessary for certain proxies", + "use UDP when communicating with the Tox network", NULL, 0, 0, twc_profile_option_defaults[option_index], NULL, 1, twc_config_profile_check_value_callback, (void *)(intptr_t)option_index, @@ -314,7 +314,6 @@ twc_config_init_profile(struct t_twc_profile *profile) twc_profile_option_names[i]); profile->options[i] = twc_config_init_option(i, option_name); - weechat_log_printf("Initialized option %s %p", option_name, profile->options[i]); free(option_name); } } diff --git a/src/twc-profile.c b/src/twc-profile.c index 8008e32..f464244 100644 --- a/src/twc-profile.c +++ b/src/twc-profile.c @@ -228,7 +228,7 @@ twc_profile_load(struct t_twc_profile *profile) options->proxy_port = TWC_PROFILE_OPTION_INTEGER(profile, TWC_PROFILE_OPTION_PROXY_PORT); options->udp_disabled = - TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_UDP_DISABLED); + !TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_UDP); if (options->proxy_enabled) { diff --git a/src/twc-profile.h b/src/twc-profile.h index 0cb989d..365e5cf 100644 --- a/src/twc-profile.h +++ b/src/twc-profile.h @@ -34,7 +34,7 @@ enum t_twc_profile_option TWC_PROFILE_OPTION_PROXY_ADDRESS, TWC_PROFILE_OPTION_PROXY_PORT, TWC_PROFILE_OPTION_PROXY_ENABLED, - TWC_PROFILE_OPTION_UDP_DISABLED, + TWC_PROFILE_OPTION_UDP, TWC_PROFILE_NUM_OPTIONS, };