2005-07-04 [colin] 1.9.12cvs19

	* src/imap.c
		Fix scan_required returning FALSE when it
		shouldn't. Maybe fix #760 (Can't retrieve
		messages)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 88d2848f7f18ddd413ee049cccde41ab3ad2c803..9e435c16bb6b1fe1ad6a8da41a4871c5ab8cdbbc 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-07-04 [colin]     1.9.12cvs19
+
+       * src/imap.c
+               Fix scan_required returning FALSE when it
+               shouldn't. Maybe fix #760 (Can't retrieve
+               messages)
+

 2005-07-04 [colin]     1.9.12cvs18
 
        * src/summaryview.c
 2005-07-04 [colin]     1.9.12cvs18
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 6085ce014a4e9c13c8b4230e122960908d5999a5..0c01c7413909bf07bee3c386282572d378fb5a62 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -613,3 +613,4 @@
 ( cvs diff -u -r 1.382.2.139 -r 1.382.2.140 src/compose.c;  cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/jpilot.c;  cvs diff -u -r 1.47.2.21 -r 1.47.2.22 src/procheader.c;  cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/vcard.c;  ) > 1.9.12cvs16.patchset
 ( cvs diff -u -r 1.36.2.35 -r 1.36.2.36 src/common/utils.c;  cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/common/utils.h;  ) > 1.9.12cvs17.patchset
 ( cvs diff -u -r 1.395.2.90 -r 1.395.2.91 src/summaryview.c;  ) > 1.9.12cvs18.patchset
 ( cvs diff -u -r 1.382.2.139 -r 1.382.2.140 src/compose.c;  cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/jpilot.c;  cvs diff -u -r 1.47.2.21 -r 1.47.2.22 src/procheader.c;  cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/vcard.c;  ) > 1.9.12cvs16.patchset
 ( cvs diff -u -r 1.36.2.35 -r 1.36.2.36 src/common/utils.c;  cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/common/utils.h;  ) > 1.9.12cvs17.patchset
 ( cvs diff -u -r 1.395.2.90 -r 1.395.2.91 src/summaryview.c;  ) > 1.9.12cvs18.patchset

+( cvs diff -u -r 1.179.2.45 -r 1.179.2.46 src/imap.c;  ) > 1.9.12cvs19.patchset

diff --git a/configure.ac b/configure.ac
index 155c38d9d92afdd3853a1f8553a1a7e374b437c8..34f135fe7c2e2409731c7f9bf1c72539fd927775 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=18
+EXTRA_VERSION=19

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index 7a33959638424b488402435d032616eba02213d9..e443ee1ae992bbe2473763ca8aa7fe9d3126bf34 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -3065,7 +3065,8 @@ gboolean imap_scan_required(Folder *folder, FolderItem *_item)
                if (ok != IMAP_SUCCESS)
                        return FALSE;
 
                if (ok != IMAP_SUCCESS)
                        return FALSE;
 

-               if (session->folder_content_changed)
+               if (session->folder_content_changed
+               ||  session->exists != item->item.total_msgs)

                        return TRUE;
        } else {
                ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
                        return TRUE;
        } else {
                ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,