2006-04-23 [colin] 2.1.1cvs25

	* src/imap.c
		Make sure uidnext is initialized in get_num_list
		(not for stable, related to 2.1.1cvs8 and friends)

diff --git a/ChangeLog b/ChangeLog
index 57bc3d1e5bedff0bd1c33f9bb737223ff1ad0df6..64b55f5717c7a57fc215246d6b3ea6aa1e2f220e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-23 [colin]     2.1.1cvs25
+
+       * src/imap.c
+               Make sure uidnext is initialized in get_num_list
+               (not for stable, related to 2.1.1cvs8 and friends)
+
 2006-04-23 [colin]     2.1.1cvs24
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 29193f0d78ee74a0f32304cb6776dbe4cb1d57e1..dceee8c14b071a4a37b0f28d1f2424c36f536d9c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1446,3 +1446,4 @@
 ( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/gtk/quicksearch.c;  ) > 2.1.1cvs22.patchset
 ( cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/logwindow.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/logwindow.h;  ) > 2.1.1cvs23.patchset
 ( cvs diff -u -r 1.179.2.107 -r 1.179.2.108 src/imap.c;  ) > 2.1.1cvs24.patchset
+( cvs diff -u -r 1.179.2.108 -r 1.179.2.109 src/imap.c;  ) > 2.1.1cvs25.patchset

diff --git a/configure.ac b/configure.ac
index 33c550294bcb4af0091f71789eb76f6a050ff8c4..52fb436226b9aeed55bf3cba9fb905a7708c8655 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index e7515f1acccccb15a60f7120310a00a10e9099c9..33484cefa2a2c2b97a2bf3b825dcab04b5cfe73f 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -3084,7 +3084,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 {
        IMAPFolderItem *item = (IMAPFolderItem *)_item;
        IMAPSession *session;
-       gint ok, nummsgs = 0, exists, uid_val, uid_next;
+       gint ok, nummsgs = 0, exists, uid_val, uid_next = 0;
        GSList *uidlist = NULL;
        gchar *dir;
        gboolean selected_folder;
@@ -3125,6 +3125,8 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                }
                exists = session->exists;
 
+               uid_next = item->c_uid_next;
+               uid_val = item->c_uid_validity;
                *old_uids_valid = TRUE;
        } else {
                if (item->use_cache && time(NULL) - item->use_cache < 2) {