summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/help/in/recode.in3
-rw-r--r--src/core/recode.c18
2 files changed, 17 insertions, 4 deletions
diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in
index 60fc41dc..510fc825 100644
--- a/docs/help/in/recode.in
+++ b/docs/help/in/recode.in
@@ -26,6 +26,9 @@ You can change them with /SET
Examples:
+/SET recode OFF
+to turn off recode completely
+
/SET recode_fallback <charset>
to set the fallback charset for incoming events
diff --git a/src/core/recode.c b/src/core/recode.c
index e073169e..353d8ed2 100644
--- a/src/core/recode.c
+++ b/src/core/recode.c
@@ -73,14 +73,18 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
char *translit_to = NULL;
char *recoded = NULL;
char *tagtarget = NULL;
- gboolean term_is_utf8, str_is_utf8, translit;
+ gboolean term_is_utf8, str_is_utf8, translit, recode;
int len;
if (!str)
return NULL;
+ recode = settings_get_bool("recode");
+ if (!recode)
+ return g_strdup(str);
+
len = strlen(str);
-
+
str_is_utf8 = g_utf8_validate(str, len, NULL);
translit = settings_get_bool("recode_transliterate");
@@ -127,12 +131,16 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target)
#ifdef HAVE_GLIB2
char *recoded = NULL;
const char *from = NULL;
- gboolean translit, term_is_utf8;
+ gboolean translit, term_is_utf8, recode;
int len;
if (!str)
return NULL;
+ recode = settings_get_bool("recode");
+ if (!recode)
+ return g_strdup(str);
+
len = strlen(str);
translit = settings_get_bool("recode_transliterate");
@@ -174,13 +182,15 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target)
void recode_init(void)
{
+ settings_add_bool("misc", "recode", TRUE);
settings_add_str("misc", "recode_fallback", "ISO8859-1");
settings_add_str("misc", "recode_out_default_charset", "");
settings_add_bool("misc", "recode_transliterate", FALSE);
}
void recode_deinit(void)
-{
+{
+ settings_remove("recode");
settings_remove("recode_fallback");
settings_remove("recode_out_default_charset");
settings_remove("recode_transliterate");