2007-09-20 [colin] 3.0.1cvs15

	* src/folderview.c
	* src/folderview.h
		Maybe fix bug 1324, 'Corrupted IMAP cache'

diff --git a/ChangeLog b/ChangeLog
index 26a16bb93bcb590c4eb33732ff863e530eac3106..32cc1f265c9ff12ff358bf254ed88f213411bc8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-20 [colin]     3.0.1cvs15
+
+       * src/folderview.c
+       * src/folderview.h
+               Maybe fix bug 1324, 'Corrupted IMAP cache'
+
 2007-09-20 [colin]     3.0.1cvs14
 
        * src/printing.c

diff --git a/PATCHSETS b/PATCHSETS
index fca9c12b87bfa4825a4583ffa0762b454d63b7d7..718c9a41be1f9a4c8a7350661f1c9f28c62daccd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2878,3 +2878,4 @@
 ( cvs diff -u -r 1.17.2.16 -r 1.17.2.17 po/ru.po;  ) > 3.0.1cvs12.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/printing.c;  ) > 3.0.1cvs13.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/printing.c;  ) > 3.0.1cvs14.patchset
+( cvs diff -u -r 1.207.2.183 -r 1.207.2.184 src/folderview.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/folderview.h;  ) > 3.0.1cvs15.patchset

diff --git a/configure.ac b/configure.ac
index 53319a9f9bff7fb745242c225e36a46fe4736017..6f0787a1a2edb9c430929644a5db6dd486b23817 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 1b6fe080ab117341a98379ed7e380d1b1eda1982..ce1db2b9e172f9fda8c635d8525f86cdd162b4aa 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1197,7 +1197,7 @@ gint folderview_check_new(Folder *folder)
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
                ctree = GTK_CTREE(folderview->ctree);
-
+               folderview->scanning_folder = folder;
                inc_lock();
                main_window_lock(folderview->mainwin);
 
@@ -1264,7 +1264,7 @@ gint folderview_check_new(Folder *folder)
                        former_new_msgs += former_new;
                        STATUSBAR_POP(folderview->mainwin);
                }
-
+               folderview->scanning_folder = NULL;
                main_window_unlock(folderview->mainwin);
                inc_unlock();
        }
@@ -2150,7 +2150,15 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
        
-       if (!can_select || summary_is_locked(folderview->summaryview)) {
+       item = gtk_ctree_node_get_row_data(ctree, row);
+       if (!item) {
+               END_TIMING();
+               folderview->open_folder = FALSE;
+               return;
+       }
+
+       if (!can_select || summary_is_locked(folderview->summaryview)
+       ||  folderview->scanning_folder == item->folder) {
                if (folderview->opened) {
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
                        gtk_ctree_select(ctree, folderview->opened);
@@ -2164,12 +2172,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                END_TIMING();
                return;
        }
-       item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item) {
-               END_TIMING();
-               folderview->open_folder = FALSE;
-               return;
-       }
 
        can_select = FALSE;
 

diff --git a/src/folderview.h b/src/folderview.h
index 5b10e5654a81c3ab3813cf1ec3b881d0e0b9590b..cf13527571b1d3e96f0d439d906ea13aa886b912 100644 (file)
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -79,6 +79,7 @@ struct _FolderView
        FolderColumnState col_state[N_FOLDER_COLS];
        gint col_pos[N_FOLDER_COLS];
        gint deferred_refresh_id;
+       Folder *scanning_folder;
 };
 
 struct _FolderViewPopup