fix 'underquoted definition' warnings in ac/*.m4; src/common/utils.c, subject_get_pre...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9ebd0ea4049e42b4350cb35329b08be2b1a2caf6..c92a4a4b5d63a1f85e765f04217eb747c9a03bd8 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,17 @@
+2003-12-28 [paul]      0.9.8claws11
+
+       * ac/aspell.m4
+         ac/check-type.m4
+         ac/gnupg-check-typedef.m4
+         ac/openssl.m4
+         ac/spamassassin.m4
+               fix 'underquoted definition' warnings, patch submitted by
+               David Relson <relson@osagesoftware.com>
+               
+       * src/common/utils.c
+               subject_get_prefix_length(): add "Odp\\:" to reply prefixes,
+               patch submitted by Jan Alboszta <J.Alboszta@students.mimuw.edu.pl>
+

 2003-12-28 [paul]      0.9.8claws10
 
        * sync with 0.9.8cvs1
 2003-12-28 [paul]      0.9.8claws10
 
        * sync with 0.9.8cvs1

diff --git a/ac/aspell.m4 b/ac/aspell.m4
index 1103ec8541eee70b2fd32cd65c76827c8d67f032..040692d443cf08619ecde19dbfad1e876d2f201f 100644 (file)
--- a/ac/aspell.m4
+++ b/ac/aspell.m4
@@ -9,7 +9,7 @@ dnl AM_PATH_ASPELL([MINIMUM-VERSION,
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for aspell, and define ASPELL_CFLAGS, ASPELL_LIBS and ASPELL_PATH
 dnl
 dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for aspell, and define ASPELL_CFLAGS, ASPELL_LIBS and ASPELL_PATH
 dnl

-AC_DEFUN(AM_PATH_ASPELL,
+AC_DEFUN([AM_PATH_ASPELL],

 [dnl
 dnl Get the cflags and libraries from the aspell-config script
 dnl
 [dnl
 dnl Get the cflags and libraries from the aspell-config script
 dnl

diff --git a/ac/check-type.m4 b/ac/check-type.m4
index 90611451bd2320be7179377a0f18e207b643c891..e65ea03b33371ffa02a27fef1f049079f96e5381 100644 (file)
--- a/ac/check-type.m4
+++ b/ac/check-type.m4
@@ -5,7 +5,7 @@ dnl `stddef.h' checks files included by INCLUDES, which should be a
 dnl series of #include statements.  If TYPE is not defined, define it
 dnl to DEFAULT.
 dnl
 dnl series of #include statements.  If TYPE is not defined, define it
 dnl to DEFAULT.
 dnl

-AC_DEFUN(SYLPHEED_CHECK_TYPE,
+AC_DEFUN([SYLPHEED_CHECK_TYPE],

 [AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL(sylpheed_cv_type_$1,
 [AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL(sylpheed_cv_type_$1,

diff --git a/ac/gnupg-check-typedef.m4 b/ac/gnupg-check-typedef.m4
index b53e2ab2fdbcfadd6d85010242e1b048f853b26e..1dd7c4711282e0cd9c4d19a6caf5a6e5dd5255d9 100644 (file)
--- a/ac/gnupg-check-typedef.m4
+++ b/ac/gnupg-check-typedef.m4
@@ -1,7 +1,7 @@
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME [, COMMENT])
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME [, COMMENT])
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl

-AC_DEFUN(GNUPG_CHECK_TYPEDEF,
+AC_DEFUN([GNUPG_CHECK_TYPEDEF],

   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
     [AC_TRY_COMPILE([#include <stdlib.h>
   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
     [AC_TRY_COMPILE([#include <stdlib.h>

diff --git a/ac/openssl.m4 b/ac/openssl.m4
index 7aa3cc0dc3456a692729fb3beba5d323a3439953..fea4649343e726fa8e70a513aa9e8e300f30de7e 100644 (file)
--- a/ac/openssl.m4
+++ b/ac/openssl.m4
@@ -2,7 +2,7 @@ dnl ******************************
 dnl OpenSSL
 dnl ******************************
 
 dnl OpenSSL
 dnl ******************************
 

-AC_DEFUN(AM_PATH_OPENSSL,
+AC_DEFUN([AM_PATH_OPENSSL],

 [dnl
        USE_OPENSSL=0
 
 [dnl
        USE_OPENSSL=0
 

diff --git a/ac/spamassassin.m4 b/ac/spamassassin.m4
index 9f783aa5136ea6eae3f715d9bf72acb23a288c9f..fd5bcc16c4de608d469872e13c20f6efbc0cc477 100644 (file)
--- a/ac/spamassassin.m4
+++ b/ac/spamassassin.m4
@@ -1,6 +1,6 @@
 dnl check for libspamc required includes
 
 dnl check for libspamc required includes
 

-AC_DEFUN(AC_SPAMASSASSIN,
+AC_DEFUN([AC_SPAMASSASSIN],

 [dnl
 
 AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h errno.h sys/errno.h)
 [dnl
 
 AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h errno.h sys/errno.h)

diff --git a/configure.ac b/configure.ac
index 08a8cdff1ee26fb9166049d1dd8d86b6a796e4db..7b2abc9e53396d95e8353612f211249caf6c9582 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/common/utils.c b/src/common/utils.c
index 98deae3be0048afb8f6f9b819c5eb3ad824b481f..c94585de0dd1e76ea2bcbd51df503cdcd9dba101 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3386,7 +3386,8 @@ int subject_get_prefix_length(const gchar *subject)
                "Antwort\\:",                   /* "Antwort:" (German Lotus Notes) */
                "Res\\:",                       /* "Res:" (Brazilian Outlook) */
                "Fw\\:",                        /* "Fw:" Forward */
                "Antwort\\:",                   /* "Antwort:" (German Lotus Notes) */
                "Res\\:",                       /* "Res:" (Brazilian Outlook) */
                "Fw\\:",                        /* "Fw:" Forward */

-               "Enc\\:"                        /* "Enc:" Forward (Brazilian Outlook) */
+               "Enc\\:",                       /* "Enc:" Forward (Brazilian Outlook) */
+               "Odp\\:"                        /* "Odp:" Re (Polish Outlook) */

                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];