From a471d030d99da5208d667549dbf1b09a9be451e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20P=C4=99kala?= Date: Tue, 24 Nov 2009 21:43:07 +0000 Subject: [PATCH] 2009-11-24 [pawel] 3.7.3cvs20 * src/common/utils.c Fix Bug 2053 'Inconsistent application of Coloration of Message text' Don't allow '<' character between quotation marks --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/utils.c | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd83a401c..954fd6b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-24 [pawel] 3.7.3cvs20 + + * src/common/utils.c + Fix Bug 2053 'Inconsistent application of Coloration + of Message text' + Don't allow '<' character between quotation marks + 2009-11-21 [holger] 3.7.3cvs19 * src/printing.c diff --git a/PATCHSETS b/PATCHSETS index f52dfc1e2..d7c97342e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3893,3 +3893,4 @@ ( cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/news_gtk.c; ) > 3.7.3cvs17.patchset ( cvs diff -u -r 1.24.2.27 -r 1.24.2.28 Makefile.am; ) > 3.7.3cvs18.patchset ( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/printing.c; ) > 3.7.3cvs19.patchset +( cvs diff -u -r 1.36.2.178 -r 1.36.2.179 src/common/utils.c; ) > 3.7.3cvs20.patchset diff --git a/configure.ac b/configure.ac index 4e70ba588..65330566a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=3 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/utils.c b/src/common/utils.c index a3d02088d..d5c65373f 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1166,8 +1166,8 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars) if (strchr(quote_chars, *p)) quote_level++; else if (*p != '-' && !g_ascii_isspace(*p) && p <= last_pos) { - /* any characters are allowed except '-' and space */ - while (*p != '-' + /* any characters are allowed except '-','<' and space */ + while (*p != '-' && *p != '<' && !strchr(quote_chars, *p) && !g_ascii_isspace(*p) && p < last_pos) -- 2.25.1