pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-02 07:46:38 +02:00
Code Activity

charset: do not allow "UTF-8" in charset options (useless because UTF-8 is the internal WeeChat charset)

Browse Source
This commit is contained in:
Sebastien Helleu
2012-07-14 10:50:49 +02:00
parent 788f634fbc
commit f4dc85a3cb
13 changed files with 147 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/charset/charset.c
+52 -9
View File
@@ -73,6 +73,46 @@ charset_config_reload (void *data, struct t_config_file *config_file)
return weechat_config_reload (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,