2007-06-05 [wwp] 2.9.2cvs41

	* src/inc.c
		Fix incoming messages from local accounts always getting filtered
		(even if the account prefs say don't), thanks to Colin.

diff --git a/ChangeLog b/ChangeLog
index ec58c2bc85a7fabaadeeab66f8d8d1fe1632784a..57200f59e9492d24b3c6eba7b5cfde25d03f7ed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-05 [wwp]       2.9.2cvs41
+
+       * src/inc.c
+               Fix incoming messages from local accounts always getting filtered
+               (even if the account prefs say don't), thanks to Colin.
+

 2007-06-05 [wwp]       2.9.2cvs40
 
        * src/compose.c
 2007-06-05 [wwp]       2.9.2cvs40
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 24e116aa38f880b7691eae9006ca89efd6dc9996..50aeff91e670fc80228d5ae503aea9ba97145af2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2616,3 +2616,4 @@
 ( cvs diff -u -r 1.382.2.385 -r 1.382.2.386 src/compose.c;  ) > 2.9.2cvs38.patchset
 ( cvs diff -u -r 1.382.2.386 -r 1.382.2.387 src/compose.c;  ) > 2.9.2cvs39.patchset
 ( cvs diff -u -r 1.382.2.387 -r 1.382.2.388 src/compose.c;  cvs diff -u -r 1.50.2.35 -r 1.50.2.36 src/compose.h;  ) > 2.9.2cvs40.patchset
 ( cvs diff -u -r 1.382.2.385 -r 1.382.2.386 src/compose.c;  ) > 2.9.2cvs38.patchset
 ( cvs diff -u -r 1.382.2.386 -r 1.382.2.387 src/compose.c;  ) > 2.9.2cvs39.patchset
 ( cvs diff -u -r 1.382.2.387 -r 1.382.2.388 src/compose.c;  cvs diff -u -r 1.50.2.35 -r 1.50.2.36 src/compose.h;  ) > 2.9.2cvs40.patchset

+( cvs diff -u -r 1.149.2.73 -r 1.149.2.74 src/inc.c;  ) > 2.9.2cvs41.patchset

diff --git a/configure.ac b/configure.ac
index 91842f320512f9c0e1571f575847ff0cc001ad27..90553d425b82284d3d433f4fe658d2cce54c74e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=40
+EXTRA_VERSION=41

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/inc.c b/src/inc.c
index 53dccaa4436fd2019605e3937e7429907c4c407f..a90a33c48ed8083a6c6c7f067bd4d9f3f17692f4 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1318,6 +1318,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);

+       g_return_val_if_fail(account != NULL, -1);

 
        if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
                debug_print("%s: no messages in local mailbox.\n", mbox);
 
        if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
                debug_print("%s: no messages in local mailbox.\n", mbox);


@@ -1339,7 +1340,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account
        debug_print("Getting new messages from %s into %s...\n",
                    mbox, dest->path);
 
        debug_print("Getting new messages from %s into %s...\n",
                    mbox, dest->path);
 

-       msgs = proc_mbox(dest, tmp_mbox, TRUE, account);
+       msgs = proc_mbox(dest, tmp_mbox, account->filter_on_recv, account);

 
        g_unlink(tmp_mbox);
        if (msgs >= 0) empty_mbox(mbox);
 
        g_unlink(tmp_mbox);
        if (msgs >= 0) empty_mbox(mbox);