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

	* src/compose.c
		Fix signatures with accentued chars in it

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6bf6dc9e8cc73db1b897b6badfa450f510d80148..181c0bed58451f71b59907e7469cbb12942a83b4 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-03-04 [colin]     1.0.1cvs22.2
+
+       * src/compose.c
+               Fix signatures with accentued chars in it
+
 2005-03-04 [colin]     1.0.1cvs22.1
 
        * src/common/smtp.c

diff --git a/PATCHSETS b/PATCHSETS
index 8b95b8b60392bae27991dcadf3f2789d77e6c917..57d4a7c16530aacb48ca7a447b286e7abee9a58b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -407,3 +407,4 @@
 ( cvs diff -u -r 1.47.2.15 -r 1.47.2.16 src/procheader.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/procheader.h; ) > 1.0.1cvs19.4.patchset
 ( cvs diff -u -r 1.2504.2.50 -r 1.2504.2.51 ChangeLog.claws; cvs diff -u -r 1.654.2.441 -r 1.654.2.442 configure.ac; cvs diff -u -r 1.94.2.47 -r 1.94.2.48 src/messageview.c; ) > 1.0.1cvs20.1.patchset
 ( cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/common/smtp.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/smtp.h; ) > 1.0.1cvs22.1.patchset
+( cvs diff -u -r 1.382.2.109 -r 1.382.2.110 src/compose.c; ) > 1.0.1cvs22.2.patchset

diff --git a/configure.ac b/configure.ac
index a8a34e9c71e3587afb113ae2a881be10f592c677..d4550549808e722c7b661724e6a9615746e16787 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=22
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

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;