0.8.11claws160

* src/imap.c
        don't use STATUS command on current folder to check for
        content changes. imap_cmd_ok() now tracks changes to
        folder and number of existing messages.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 33f6d1816068ac9432f610ea3485fd9c5d188985..e367284f79b12441d2e87d763b3bc8fe8827a9c7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-05-17 [christoph] 0.8.11claws160
+
+       * src/imap.c
+               don't use STATUS command on current folder to check for
+               content changes. imap_cmd_ok() now tracks changes to
+               folder and number of existing messages.
+

 2003-05-17 [paul]      0.8.11claws159
 
        * src/plugins/clamav/clamav_plugin.c
 2003-05-17 [paul]      0.8.11claws159
 
        * src/plugins/clamav/clamav_plugin.c

diff --git a/configure.ac b/configure.ac
index 871e5744538dabca1749b869604458aaaca946f0..a297fae2c8ab5ce7fca95516186022f6b075bb82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws159
+EXTRA_VERSION=claws160

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index 8d7b6c4c6d3fdfb336ff07998dd1c889585a457f..89ed6769847c074089f27ad9c7dffb319b36eb97 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -82,6 +82,8 @@ struct _IMAPSession
        time_t last_access_time;
        gboolean authenticated;
        guint cmd_count;
        time_t last_access_time;
        gboolean authenticated;
        guint cmd_count;

+       gboolean folder_content_changed;
+       guint exists;

 };
 
 struct _IMAPNameSpace
 };
 
 struct _IMAPNameSpace


@@ -2119,8 +2121,10 @@ static gint imap_select(IMAPSession *session, IMAPFolder *folder,
                             exists, recent, unseen, uid_validity);
        if (ok != IMAP_SUCCESS)
                log_warning(_("can't select folder: %s\n"), real_path);
                             exists, recent, unseen, uid_validity);
        if (ok != IMAP_SUCCESS)
                log_warning(_("can't select folder: %s\n"), real_path);

-       else
+       else {

                session->mbox = g_strdup(path);
                session->mbox = g_strdup(path);

+               session->folder_content_changed = FALSE;
+       }

        g_free(real_path);
 
        return ok;
        g_free(real_path);
 
        return ok;


@@ -2756,21 +2760,39 @@ static gint imap_cmd_ok(IMAPSession *session, GPtrArray *argbuf)
        gint ok;
        gchar *buf;
        gint cmd_num;
        gint ok;
        gchar *buf;
        gint cmd_num;

-       gchar cmd_status[IMAPBUFSIZE];
+       gchar *data;

 
        while ((ok = imap_gen_recv(session, &buf))
               == IMAP_SUCCESS) {
 
        while ((ok = imap_gen_recv(session, &buf))
               == IMAP_SUCCESS) {

+               // make sure data is long enough for any substring of buf
+               data = alloca(strlen(buf) + 1);
+

                if (buf[0] == '*' && buf[1] == ' ') {
                if (buf[0] == '*' && buf[1] == ' ') {

+                       gint num;

                        if (argbuf)
                                g_ptr_array_add(argbuf, g_strdup(buf + 2));
                        if (argbuf)
                                g_ptr_array_add(argbuf, g_strdup(buf + 2));

+
+                       if (sscanf(buf + 2, "%d %s", &num, data) < 2)
+                               continue;
+
+                       if (!strcmp(data, "EXISTS")) {
+                               session->exists = num;
+                               session->folder_content_changed = TRUE;
+                       }
+
+                       if(!strcmp(data, "EXPUNGE")) {
+                               session->exists--;
+                               session->folder_content_changed = TRUE;
+                       }
+

                        continue;
                }
 
                        continue;
                }
 

-               if (sscanf(buf, "%d %s", &cmd_num, cmd_status) < 2) {
+               if (sscanf(buf, "%d %s", &cmd_num, data) < 2) {

                        g_free(buf);
                        return IMAP_ERROR;
                } else if (cmd_num == session->cmd_count &&
                        g_free(buf);
                        return IMAP_ERROR;
                } else if (cmd_num == session->cmd_count &&

-                        !strcmp(cmd_status, "OK")) {
+                        !strcmp(data, "OK")) {

                        if (argbuf)
                                g_ptr_array_add(argbuf, g_strdup(buf));
                        g_free(buf);
                        if (argbuf)
                                g_ptr_array_add(argbuf, g_strdup(buf));
                        g_free(buf);


@@ -3193,6 +3215,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
        gint ok, nummsgs = 0, exists, recent, unseen, uid_val, uid_next;
        GSList *uidlist;
        gchar *dir;
        gint ok, nummsgs = 0, exists, recent, unseen, uid_val, uid_next;
        GSList *uidlist;
        gchar *dir;

+       gboolean selected_folder;

 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);


@@ -3203,16 +3226,26 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
        session = imap_session_get(folder);
        g_return_val_if_fail(session != NULL, -1);
 
        session = imap_session_get(folder);
        g_return_val_if_fail(session != NULL, -1);
 

-       ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
-                        &exists, &recent, &uid_next, &uid_val, &unseen);
-       if (ok != IMAP_SUCCESS)
-               return -1;
+       selected_folder = (session->mbox != NULL) &&
+                         (!strcmp(session->mbox, item->item.path));
+       if (selected_folder) {
+               ok = imap_cmd_noop(session);
+               if (ok != IMAP_SUCCESS)
+                       return -1;
+               exists = session->exists;
+       } else {
+               ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
+                                &exists, &recent, &uid_next, &uid_val, &unseen);
+               if (ok != IMAP_SUCCESS)
+                       return -1;
+       }

 
        /* If old uid_next matches new uid_next we can be sure no message
           was added to the folder */
 
        /* If old uid_next matches new uid_next we can be sure no message
           was added to the folder */

-       if (uid_next == item->uid_next) {
+       if (( selected_folder && !session->folder_content_changed) ||
+           (!selected_folder && uid_next == item->uid_next)) {

                nummsgs = g_slist_length(item->uid_list);
                nummsgs = g_slist_length(item->uid_list);

-               
+

                /* If number of messages is still the same we
                    know our caches message numbers are still valid,
                    otherwise if the number of messages has decrease
                /* If number of messages is still the same we
                    know our caches message numbers are still valid,
                    otherwise if the number of messages has decrease


@@ -3228,7 +3261,8 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
                        item->uid_list = NULL;
                }
        }
                        item->uid_list = NULL;
                }
        }

-       item->uid_next = uid_next;
+       if (!selected_folder)
+               item->uid_next = uid_next;

 
        if (exists == 0) {
                *msgnum_list = NULL;
 
        if (exists == 0) {
                *msgnum_list = NULL;