2009-08-21 [colin] 3.7.2cvs21

	* AUTHORS
	* src/gtk/authors.h
	* src/common/utils.c
		Add Réf. : reply prefix (french Lotus Notes); patch
		by Didier Barvaux

diff --git a/AUTHORS b/AUTHORS
index 1cc29dd3a4374facbba76326783e0f9c76f574b9..b8b15c775dc39b515aefba2c8496e9a3eb8a8673 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -276,3 +276,4 @@ contributors (in addition to the above; based on Changelog)
        Wei-Lun Chao
        Jacob Head
        Fabian Keil
+       Didier Barvaux

diff --git a/ChangeLog b/ChangeLog
index ee98bb5a6a789ef58f83570383829649dffe4550..a809f35b3c894ec54e3fe4c9d74d72f8fa27e30c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-21 [colin]     3.7.2cvs21
+
+       * AUTHORS
+       * src/gtk/authors.h
+       * src/common/utils.c
+               Add Réf. : reply prefix (french Lotus Notes); patch
+               by Didier Barvaux
+
 2009-08-21 [colin]     3.7.2cvs20
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 878416c1e55f3aca004cf0cc9dfd1b4dbd60fb89..29a8832fb064d1f34d8b29ebdb2d5347da19a24a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3845,3 +3845,4 @@
 ( cvs diff -u -r 1.115.2.221 -r 1.115.2.222 src/main.c;  ) > 3.7.2cvs18.patchset
 ( cvs diff -u -r 1.382.2.519 -r 1.382.2.520 src/compose.c;  cvs diff -u -r 1.50.2.54 -r 1.50.2.55 src/compose.h;  ) > 3.7.2cvs19.patchset
 ( cvs diff -u -r 1.65.2.68 -r 1.65.2.69 src/codeconv.c;  cvs diff -u -r 1.15.2.22 -r 1.15.2.23 src/codeconv.h;  ) > 3.7.2cvs20.patchset
+( cvs diff -u -r 1.100.2.72 -r 1.100.2.73 AUTHORS;  cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/gtk/authors.h;  cvs diff -u -r 1.36.2.172 -r 1.36.2.173 src/common/utils.c;  ) > 3.7.2cvs21.patchset

diff --git a/configure.ac b/configure.ac
index 746c93e110490ce5788fa52a91b08d48b00dce0f..d6de5cb4399d5503b94eefae585388bf451e5154 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 276bbb138638aeaf99f79fb6e91a57d072cdd86c..d99c44e891600cabeed08cf26cef3a405c4632c5 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3666,18 +3666,6 @@ void subject_table_remove(GHashTable *subject_table, gchar * subject)
        g_hash_table_remove(subject_table, subject);
 }
 
-/*!
- *\brief       Check if a string is prefixed with known (combinations)
- *             of prefixes. The function assumes that each prefix
- *             is terminated by zero or exactly _one_ space.
- *
- *\param       str String to check for a prefixes
- *
- *\return      int Number of chars in the prefix that should be skipped
- *             for a "clean" subject line. If no prefix was found, 0
- *             is returned.
- */
- 
 #ifndef G_OS_WIN32
 static regex_t u_regex;
 static gboolean u_init_;
@@ -3693,6 +3681,17 @@ void utils_free_regex(void)
 #endif
 }
 
+/*!
+ *\brief       Check if a string is prefixed with known (combinations)
+ *             of prefixes. The function assumes that each prefix
+ *             is terminated by zero or exactly _one_ space.
+ *
+ *\param       str String to check for a prefixes
+ *
+ *\return      int Number of chars in the prefix that should be skipped
+ *             for a "clean" subject line. If no prefix was found, 0
+ *             is returned.
+ */
 int subject_get_prefix_length(const gchar *subject)
 {
 #ifndef G_OS_WIN32
@@ -3712,7 +3711,8 @@ int subject_get_prefix_length(const gchar *subject)
                "Sv\\:",                        /* "Sv" (Norwegian) */
                "Vs\\:",                        /* "Vs" (Norwegian) */
                "Ad\\:",                        /* "Ad" (Norwegian) */
-               "\347\255\224\345\244\215\\:"   /* "Re" (Chinese, UTF-8) */
+               "\347\255\224\345\244\215\\:",  /* "Re" (Chinese, UTF-8) */
+               "R\303\251f\\. \\:",    /* "Réf. :" (French Lotus Notes) */
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
@@ -3770,6 +3770,7 @@ int subject_get_prefix_length(const gchar *subject)
                "sv:",                  /* "Sv" (Norwegian) */
                "vs:",                  /* "Vs" (Norwegian) */
                "ad:",                  /* "Ad" (Norwegian) */
+               "R\303\251f. :",        /* "Réf. :" (French Lotus Notes) */
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index d3e933ae6249c34e23e171fe1acb263eb7407aeb..172d9c35158fe288c61839bed888f57e0e2b2c4c 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -86,6 +86,7 @@ static char *CONTRIBS_LIST[] = {
 "Fabio Junior Beneditto",
 "M. Benkmann",
 "Wilbert Berendsen",
+"Didier Barvaux",
 "Jean-Luc Biord",
 "Pavlo Bohmat",
 "Eugene Brevdo",