talons

commit 0a623e1628316c406cb1898d2fd0505fa5205499
parent 745513326a9a543026c0c55c54b0d9ababbd22e4
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Tue,  6 Jan 2009 09:26:49 +0000

2009-01-06 [wwp]	3.7.0cvs14

	* src/common/utils.c
		Fix cvs13, thanks to Colin.

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
5
++---

4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-06 [wwp]	3.7.0cvs14
+
+	* src/common/utils.c
+		Fix cvs13, thanks to Colin.
+
 2009-01-06 [wwp]	3.7.0cvs13
 
 	* src/common/utils.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3675,3 +3675,4 @@
 ( cvs diff -u -r 1.25.2.61 -r 1.25.2.62 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.38 -r 1.18.2.39 src/stock_pixmap.h;  ) > 3.7.0cvs11.patchset
 ( cvs diff -u -r 1.207.2.208 -r 1.207.2.209 src/folderview.c;  ) > 3.7.0cvs12.patchset
 ( cvs diff -u -r 1.36.2.158 -r 1.36.2.159 src/common/utils.c;  ) > 3.7.0cvs13.patchset
+( cvs diff -u -r 1.36.2.159 -r 1.36.2.160 src/common/utils.c;  ) > 3.7.0cvs14.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -3660,11 +3660,10 @@ int subject_get_prefix_length(const gchar *subject)
 	static const gchar * const prefixes[] = {
 		"Re\\:",			/* "Re:" */
 		"Re\\[[1-9][0-9]*\\]\\:",	/* "Re[XXX]:" (non-conforming news mail clients) */
-		"Res\\:",			/* "Res:" (Spanish Outlook) */
 		"Antw\\:",			/* "Antw:" (Dutch / German Outlook) */
 		"Aw\\:",			/* "Aw:"   (German) */
 		"Antwort\\:",			/* "Antwort:" (German Lotus Notes) */
-		"Res\\:",			/* "Res:" (Brazilian Outlook) */
+		"Res\\:",			/* "Res:" (Spanish/Brazilian Outlook) */
 		"Fw\\:",			/* "Fw:" Forward */
 		"Fwd\\:",			/* "Fwd:" Forward */
 		"Enc\\:",			/* "Enc:" Forward (Brazilian Outlook) */
@@ -3722,7 +3721,7 @@ int subject_get_prefix_length(const gchar *subject)
 		"antw:",			/* "Antw:" (Dutch / German Outlook) */
 		"aw:",			/* "Aw:"   (German) */
 		"antwort:",			/* "Antwort:" (German Lotus Notes) */
-		"res:",			/* "Res:" (Brazilian Outlook) */
+		"res:",			/* "Res:" (Spanish/Brazilian Outlook) */
 		"fw:",			/* "Fw:" Forward */
 		"fwd:",			/* "Fwd:" Forward */
 		"enc:",			/* "Enc:" Forward (Brazilian Outlook) */