2005-03-04 [colin] 1.0.1cvs22.2

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 407e2caa6cda483fea5864eec8eac5b6514b24ff..674b2f239817181b0f90fdf33be4e556b63e62fa 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2157,9 +2157,12 @@ static gchar *compose_get_signature_str(Compose *compose)
                sig_str = g_strconcat("\n\n", sig_body, NULL);
 
        if (sig_str) {
-               utf8_sig_str = conv_codeset_strdup
-                       (sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
-               g_free(sig_str);
+               if (!g_utf8_validate(sig_str,1, NULL)) {
+                       utf8_sig_str = conv_codeset_strdup
+                               (sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
+                       g_free(sig_str);
+               } else
+                       utf8_sig_str = sig_str;
        }
 
        return utf8_sig_str;