Decouple codeconv.c from prefs_common.

diff --git a/src/codeconv.c b/src/codeconv.c
index 0865f2c1acbac24701f59ae767794112c8e4a682..9b59e7dedd1baa69b6806abc20ac229517c43c9e 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -39,7 +39,6 @@
 #include "unmime.h"
 #include "quoted-printable.h"
 #include "utils.h"
 #include "unmime.h"
 #include "quoted-printable.h"
 #include "utils.h"

-#include "prefs_common.h"

 
 /* For unknown reasons the inconv.m4 macro undefs that macro if no
    const is needed.  This would break the code below so we define it. */
 
 /* For unknown reasons the inconv.m4 macro undefs that macro if no
    const is needed.  This would break the code below so we define it. */


@@ -145,11 +144,23 @@ static gint conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
 static gint conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
 static gint conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf);
 
 static gint conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf);
 static gint conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf);
 

-static gboolean strict_mode = FALSE;
+static gboolean codeconv_strict_mode = FALSE;
+static gboolean codeconv_allow_jisx0201_kana = FALSE;
+static gboolean codeconv_broken_are_utf8 = FALSE;

 
 void codeconv_set_strict(gboolean mode)
 {
 
 void codeconv_set_strict(gboolean mode)
 {

-       strict_mode = mode;
+       codeconv_strict_mode = mode;
+}
+
+void codeconv_set_allow_jisx0201_kana(gboolean allow)
+{
+       codeconv_allow_jisx0201_kana = allow;
+}
+
+void codeconv_set_broken_are_utf8(gboolean are)
+{
+       codeconv_broken_are_utf8 = are;

 }
 
 static gint conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
 }
 
 static gint conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)


@@ -329,7 +340,7 @@ static gint conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
                        }
                } else if (iseuchwkana1(*in)) {
                        if (iseuchwkana2(*(in + 1))) {
                        }
                } else if (iseuchwkana1(*in)) {
                        if (iseuchwkana2(*(in + 1))) {

-                               if (prefs_common.allow_jisx0201_kana) {
+                               if (codeconv_allow_jisx0201_kana) {

                                        HW_IN();
                                        in++;
                                        *out++ = *in++ & 0x7f;
                                        HW_IN();
                                        in++;
                                        *out++ = *in++ & 0x7f;


@@ -835,7 +846,7 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 
        if (!strcmp2(src_code, dest_code)) {
                CharSet dest_charset = conv_get_charset_from_str(dest_code);
 
        if (!strcmp2(src_code, dest_code)) {
                CharSet dest_charset = conv_get_charset_from_str(dest_code);

-               if (strict_mode && dest_charset == C_UTF_8) {
+               if (codeconv_strict_mode && dest_charset == C_UTF_8) {

                        /* ensure valid UTF-8 if target is UTF-8 */
                        if (!g_utf8_validate(inbuf, -1, NULL)) {
                                return NULL;
                        /* ensure valid UTF-8 if target is UTF-8 */
                        if (!g_utf8_validate(inbuf, -1, NULL)) {
                                return NULL;


@@ -847,14 +858,16 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 
        src_code = conv_get_fallback_for_private_encoding(src_code);
        conv_func = conv_get_code_conv_func(src_code, dest_code);
 
        src_code = conv_get_fallback_for_private_encoding(src_code);
        conv_func = conv_get_code_conv_func(src_code, dest_code);

-       if (conv_func == conv_ustodisp && strict_mode && !is_ascii_str(inbuf))
+       if (conv_func == conv_ustodisp
+                       && codeconv_strict_mode
+                       && !is_ascii_str(inbuf))

                return NULL;
 
        if (conv_func != conv_noconv) {
                len = (strlen(inbuf) + 1) * 3;
                buf = g_malloc(len);
 
                return NULL;
 
        if (conv_func != conv_noconv) {
                len = (strlen(inbuf) + 1) * 3;
                buf = g_malloc(len);
 

-               if (conv_func(buf, len, inbuf) == 0 || !strict_mode)
+               if (conv_func(buf, len, inbuf) == 0 || !codeconv_strict_mode)

                        return g_realloc(buf, strlen(buf) + 1);
                else {
                        g_free(buf);
                        return g_realloc(buf, strlen(buf) + 1);
                else {
                        g_free(buf);


@@ -1024,7 +1037,7 @@ gchar *conv_iconv_strdup_with_cd(const gchar *inbuf, iconv_t cd)
        while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
                               &outbuf_p, &out_left)) == (size_t)-1) {
                if (EILSEQ == errno) {
        while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
                               &outbuf_p, &out_left)) == (size_t)-1) {
                if (EILSEQ == errno) {

-                       if (strict_mode) {
+                       if (codeconv_strict_mode) {

                                g_free(outbuf);
                                return NULL;
                        }
                                g_free(outbuf);
                                return NULL;
                        }


@@ -1442,7 +1455,7 @@ static CharSet conv_get_locale_charset_no_utf8(void)
        const gchar *p;
        gint i;
 
        const gchar *p;
        gint i;
 

-       if (prefs_common.broken_are_utf8) {
+       if (codeconv_broken_are_utf8) {

                cur_charset = C_UTF_8;
                return cur_charset;
        }
                cur_charset = C_UTF_8;
                return cur_charset;
        }


@@ -1768,7 +1781,7 @@ void conv_encode_header_full(gchar *dest, gint len, const gchar *src,
                                out_str = conv_codeset_strdup
                                        (part_str, cur_encoding, out_encoding);
                                if (!out_str) {
                                out_str = conv_codeset_strdup
                                        (part_str, cur_encoding, out_encoding);
                                if (!out_str) {

-                                       if (strict_mode) {
+                                       if (codeconv_strict_mode) {

                                                *dest = '\0';
                                                return;
                                        } else {
                                                *dest = '\0';
                                                return;
                                        } else {

diff --git a/src/codeconv.h b/src/codeconv.h
index 4109a134d4d08378e3ea0de6900bb552f9cbbf5b..27049855842afa25e00594f989f58689dee0d7e2 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -218,5 +218,9 @@ void conv_encode_header_full                (gchar          *dest,
 
 gchar *conv_filename_from_utf8         (const gchar    *utf8_file);
 gchar *conv_filename_to_utf8           (const gchar    *fs_file);
 
 gchar *conv_filename_from_utf8         (const gchar    *utf8_file);
 gchar *conv_filename_to_utf8           (const gchar    *fs_file);

+

 void codeconv_set_strict               (gboolean        mode);
 void codeconv_set_strict               (gboolean        mode);

+void codeconv_set_allow_jisx0201_kana  (gboolean        allow);
+void codeconv_set_broken_are_utf8      (gboolean        are);
+

 #endif /* __CODECONV_H__ */
 #endif /* __CODECONV_H__ */

diff --git a/src/main.c b/src/main.c
index 1c7345eb2925a305c26fd2f4ec0d729ed666ff17..ce6de6aaa20a15a2b17f9a5bbd1c546be877f6fc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1273,6 +1273,9 @@ int main(int argc, char *argv[])
        prefs_spelling_init();
 #endif
 
        prefs_spelling_init();
 #endif
 

+       codeconv_set_allow_jisx0201_kana(prefs_common.allow_jisx0201_kana);
+       codeconv_set_broken_are_utf8(prefs_common.broken_are_utf8);
+

 #ifdef G_OS_WIN32
        if(prefs_common.gtk_theme && strcmp(prefs_common.gtk_theme, DEFAULT_W32_GTK_THEME))
                gtk_settings_set_string_property(gtk_settings_get_default(),
 #ifdef G_OS_WIN32
        if(prefs_common.gtk_theme && strcmp(prefs_common.gtk_theme, DEFAULT_W32_GTK_THEME))
                gtk_settings_set_string_property(gtk_settings_get_default(),