2007-10-03 [colin] 3.0.2cvs2

	* src/folderview.c
		Prevent opening folder item while folder
		is scanned in a better way

diff --git a/ChangeLog b/ChangeLog
index 71ca8369bd2a3f83b58ce0bd66d1b3250f68c33b..3545edd090c103d328c26dbe4431dca7c256e055 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-03 [colin]     3.0.2cvs2
+
+       * src/folderview.c
+               Prevent opening folder item while folder
+               is scanned in a better way
+
 2007-10-02 [paul]      3.0.2cvs1
 
        * NEWS

diff --git a/PATCHSETS b/PATCHSETS
index e5e5ace4663e8e84af60d9b421684c92742f2244..2687173a95ffffebbb1fc18a6e3440d93b6ef3a7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2914,3 +2914,4 @@
 ( cvs diff -u -r 1.179.2.189 -r 1.179.2.190 src/imap.c;  ) > 3.0.1cvs48.patchset
 ( cvs diff -u -r 1.179.2.190 -r 1.179.2.191 src/imap.c;  ) > 3.0.1cvs49.patchset
 ( cvs diff -u -r 1.42.2.35 -r 1.42.2.36 NEWS;  cvs diff -u -r 1.8.2.42 -r 1.8.2.43 README;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 RELEASE_NOTES;  cvs diff -u -r 1.654.2.2969 -r 1.654.2.2970 configure.ac;  ) > 3.0.2cvs1.patchset
+( cvs diff -u -r 1.207.2.185 -r 1.207.2.186 src/folderview.c;  ) > 3.0.2cvs2.patchset

diff --git a/configure.ac b/configure.ac
index 12e906253e3a093efc83e95e9ca438c8420900a2..5c802bcddd5cd5c1434d0dc7447be0bd153755f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 8d77e2f19df3a47b6b1443b6d87c0340585122f7..fd708ed8f8a1bcd2191c60f875986431ea52ba8b 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2162,8 +2162,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
 
-       if (!can_select || summary_is_locked(folderview->summaryview)
-       ||  folderview->scanning_folder == item->folder) {
+       if (!can_select || summary_is_locked(folderview->summaryview)) {
                if (folderview->opened) {
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
                        gtk_ctree_select(ctree, folderview->opened);
@@ -2216,7 +2215,12 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        main_window_cursor_wait(folderview->mainwin);
 
-       res = folder_item_open(item);
+       if (folderview->scanning_folder == item->folder) {
+               res = -2;
+       } else {
+               res = folder_item_open(item);
+       }
+
        if (res == -1 && item->no_select == FALSE) {
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);