diff options
Diffstat (limited to 'src/plugins/charset/charset.c')
| -rw-r--r-- | src/plugins/charset/charset.c | 61 |
1 files changed, 52 insertions, 9 deletions
diff --git a/src/plugins/charset/charset.c b/src/plugins/charset/charset.c index adfb8b984..9b0b47942 100644 --- a/src/plugins/charset/charset.c +++ b/src/plugins/charset/charset.c @@ -74,6 +74,46 @@ charset_config_reload (void *data, struct t_config_file *config_file) } /* + * charset_is_allowed: check if charset is allowed (different from "UTF-8", + * which is the internal charset) + * return 1 if charset is allowed, otherwise 0 + * (and error is displayed) + */ + +int +charset_is_allowed (const char *charset) +{ + if (weechat_strcasestr (charset, "utf-8") + || weechat_strcasestr (charset, "utf8")) + { + weechat_printf (NULL, + _("%s%s: UTF-8 is now allowed in charset options (it " + "is internal and default charset: default encode " + "is UTF-8 and decode of UTF-8 is OK even if you " + "specify another charset to decode)"), + weechat_prefix ("error"), CHARSET_PLUGIN_NAME); + return 0; + } + + return 1; +} + +/* + * charset_check_charset_cb: callback called to check the charset value + */ + +int +charset_check_charset_cb (void *data, struct t_config_option *option, + const char *value) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + return charset_is_allowed (value); +} + +/* * charset_config_create_option: set a charset */ @@ -108,13 +148,16 @@ charset_config_create_option (void *data, struct t_config_file *config_file, { if (value && value[0]) { - ptr_option = weechat_config_new_option ( - config_file, section, - option_name, "string", NULL, - NULL, 0, 0, "", value, 0, - NULL, NULL, NULL, NULL, NULL, NULL); - rc = (ptr_option) ? - WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE : WEECHAT_CONFIG_OPTION_SET_ERROR; + if (charset_is_allowed (value)) + { + ptr_option = weechat_config_new_option ( + config_file, section, + option_name, "string", NULL, + NULL, 0, 0, "", value, 0, + &charset_check_charset_cb, NULL, NULL, NULL, NULL, NULL); + rc = (ptr_option) ? + WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE : WEECHAT_CONFIG_OPTION_SET_ERROR; + } } else rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE; @@ -167,13 +210,13 @@ charset_config_init () && (strcasecmp (charset_terminal, charset_internal) != 0)) ? charset_terminal : "iso-8859-1", NULL, 0, - NULL, NULL, NULL, NULL, NULL, NULL); + &charset_check_charset_cb, NULL, NULL, NULL, NULL, NULL); charset_default_encode = weechat_config_new_option ( charset_config_file, ptr_section, "encode", "string", N_("global encoding charset"), NULL, 0, 0, "", NULL, 0, - NULL, NULL, NULL, NULL, NULL, NULL); + &charset_check_charset_cb, NULL, NULL, NULL, NULL, NULL); ptr_section = weechat_config_new_section (charset_config_file, "decode", 1, 1, |