2006-12-20 [paul] 2.6.1cvs56

	* configure.ac
		last of the renaming (??)
	* src/main.c
		correct --help info of --status-full
	* src/plugins/bogofilter/bogofilter.c
		make FALSE default of whitelist_ab

diff --git a/ChangeLog b/ChangeLog
index c9201eef77f37504ff06b2a27d9abea0f885a5ea..8c4318994cde7745e3024c7ddf7b06babda42aff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-20 [paul]      2.6.1cvs56
+
+       * configure.ac
+               last of the renaming (??)
+       * src/main.c
+               correct --help info of --status-full
+       * src/plugins/bogofilter/bogofilter.c
+               make FALSE default of whitelist_ab
+

 2006-12-19 [colin]     2.6.1cvs55
 
        * src/jpilot.c
 2006-12-19 [colin]     2.6.1cvs55
 
        * src/jpilot.c

diff --git a/PATCHSETS b/PATCHSETS
index 28bbaa3dc595fd298f25ea4cd024d893ce7f5169..8e2f44b24047f64ec6f05d7266e18eef20403a47 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2163,3 +2163,4 @@
 ( cvs diff -u -r 1.42.2.28 -r 1.42.2.29 po/fr.po;  ) > 2.6.1cvs53.patchset
 ( cvs diff -u -r 1.18.2.18 -r 1.18.2.19 src/jpilot.c;  ) > 2.6.1cvs54.patchset
 ( cvs diff -u -r 1.18.2.19 -r 1.18.2.20 src/jpilot.c;  ) > 2.6.1cvs55.patchset
 ( cvs diff -u -r 1.42.2.28 -r 1.42.2.29 po/fr.po;  ) > 2.6.1cvs53.patchset
 ( cvs diff -u -r 1.18.2.18 -r 1.18.2.19 src/jpilot.c;  ) > 2.6.1cvs54.patchset
 ( cvs diff -u -r 1.18.2.19 -r 1.18.2.20 src/jpilot.c;  ) > 2.6.1cvs55.patchset

+( cvs diff -u -r 1.654.2.2217 -r 1.654.2.2218 configure.ac;  cvs diff -u -r 1.115.2.120 -r 1.115.2.121 src/main.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/bogofilter/bogofilter.c;  ) > 2.6.1cvs56.patchset

diff --git a/configure.ac b/configure.ac
index d9a094e146dc47b942e7f1bf1c117799e0d0e75a..e90fb286d77f31a7eb2c8366a6de871000f5afe0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=55
+EXTRA_VERSION=56

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -793,7 +793,7 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
           if test "$LIBETPAN_VERSION" -lt "048"; then
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
           if test "$LIBETPAN_VERSION" -lt "048"; then

-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.48 or newer. See http://www.etpan.org/])
+               AC_MSG_RESULT([*** Claws Mail requires libetpan 0.48 or newer. See http://www.etpan.org/])

                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
                 AC_MSG_ERROR([libetpan 0.48 not found])
           fi
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
                 AC_MSG_ERROR([libetpan 0.48 not found])
           fi


@@ -801,7 +801,7 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else

-          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.48 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Claws Mail requires libetpan 0.48 or newer. See http://www.etpan.org/ ])

           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
            AC_MSG_ERROR([libetpan 0.48 not found])
        fi
           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
            AC_MSG_ERROR([libetpan 0.48 not found])
        fi

diff --git a/src/main.c b/src/main.c
index 14202eaba97084e79aa5265ec20b4af54ac46c21..9f1e4d6440c885909561ffd735264211be705ea4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1085,7 +1085,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("%s\n", _("  --status-full [folder]...\n"
                               "                         show the status of each folder"));
                        g_print("%s\n", _("  --select folder[/msg]  jumps to the specified folder/message\n" 
                        g_print("%s\n", _("  --status-full [folder]...\n"
                               "                         show the status of each folder"));
                        g_print("%s\n", _("  --select folder[/msg]  jumps to the specified folder/message\n" 

-                                         "                         folder is a folder id like '#mh/Mailbox/inbox'"));
+                                         "                         folder is a folder id like 'folder/sub_folder'"));

                        g_print("%s\n", _("  --online               switch to online mode"));
                        g_print("%s\n", _("  --offline              switch to offline mode"));
                        g_print("%s\n", _("  --exit                 exit Claws Mail"));
                        g_print("%s\n", _("  --online               switch to online mode"));
                        g_print("%s\n", _("  --offline              switch to offline mode"));
                        g_print("%s\n", _("  --exit                 exit Claws Mail"));

diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index cd863416451837b9210ee7a108c2662f5f0f602e..9060d13c8f7ca308028fa342e64634f5cbadec5b 100644 (file)
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -93,7 +93,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"insert_header", "FALSE", &config.insert_header, P_BOOL,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"insert_header", "FALSE", &config.insert_header, P_BOOL,
         NULL, NULL, NULL},

-       {"whitelist_ab", "TRUE", &config.whitelist_ab, P_BOOL,
+       {"whitelist_ab", "FALSE", &config.whitelist_ab, P_BOOL,

         NULL, NULL, NULL},
        {"whitelist_ab_folder", "Any", &config.whitelist_ab_folder, P_STRING,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"whitelist_ab_folder", "Any", &config.whitelist_ab_folder, P_STRING,
         NULL, NULL, NULL},