2004-08-24 [colin] 0.9.12cvs79.3

	* src/matcher_parser_lex.l
		Fix 8bits strings not in utf8

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 999abddaa96206691d457c960f25ab447e412427..9865ae0ca1d4e9ee26510005a4d18e351ea00d3f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-24 [colin]     0.9.12cvs79.3
+
+       * src/matcher_parser_lex.l
+               Fix 8bits strings not in utf8
+
 2004-08-24 [colin]     0.9.12cvs79.2
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 7fa4111bef31d0bb87d56123771502f9870b2e7f..c1e9e05f713bcbdb929f5647380a9973f933895c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -135,3 +135,4 @@
 ( cvs diff -u -r 1.30.2.1 -r 1.30.2.2 src/rfc2015.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/rfc2015.h; ) > 0.9.12cvs78.1.patchset
 ( cvs diff -u -r 1.382.2.44 -r 1.382.2.45 src/compose.c; ) > 0.9.12cvs79.1.patchset
 ( cvs diff -u -r 1.382.2.45 -r 1.382.2.46 src/compose.c; ) > 0.9.12cvs79.2.patchset
+( cvs diff -u -r 1.16.2.1 -r 1.16.2.2 src/matcher_parser_lex.l; ) > 0.9.12cvs79.3.patchset

diff --git a/configure.ac b/configure.ac
index 7bbf9394d047f4d3f69b9b00fd870326234e546e..7e0d4f9c389bbbef8cf535bffd162c65b1572ca0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=79
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3
 
 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/matcher_parser_lex.l b/src/matcher_parser_lex.l
index 12b421bd955638b9ea568d59d9a9a763cb9d629b..53a3412fde683a83c0e7a60c1223472769bd1921 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <glib.h>
 
+#include "codeconv.h"
 #include "matcher.h"
 #include "matcher_parser_lex.h"
 #include "matcher_parser_parse.h"
@@ -80,6 +81,13 @@ void matcher_parser_init(void)
                /* get out of the state: string ends. */
                BEGIN(0);
                *string_buf_ptr = '\0';
+               if (!g_utf8_validate(string_buf, -1, NULL)) {
+                       gchar *tmp = conv_codeset_strdup(string_buf, conv_get_current_charset_str(), CS_UTF_8);
+                       if (tmp) {
+                               strcpy(string_buf, tmp);
+                               g_free(tmp);
+                       }
+               }
                yylval.str = string_buf;
                return MATCHER_STRING;
                }