2007-09-21 [colin] 3.0.1cvs16

	* src/folderview.c
		Complete 3.0.1cvs15

diff --git a/ChangeLog b/ChangeLog
index 32cc1f265c9ff12ff358bf254ed88f213411bc8b..9058ad88d1728176b16fff6770b5ccca85c368b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-21 [colin]     3.0.1cvs16
+
+       * src/folderview.c
+               Complete 3.0.1cvs15
+
 2007-09-20 [colin]     3.0.1cvs15
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 718c9a41be1f9a4c8a7350661f1c9f28c62daccd..d83779143c4c8d7411848077783975853e7ed610 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2879,3 +2879,4 @@
 ( 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
+( cvs diff -u -r 1.207.2.184 -r 1.207.2.185 src/folderview.c;  ) > 3.0.1cvs16.patchset

diff --git a/configure.ac b/configure.ac
index 6f0787a1a2edb9c430929644a5db6dd486b23817..387881586b10624826e7b40cc6f823d7f75cf6b9 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=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index ce1db2b9e172f9fda8c635d8525f86cdd162b4aa..8d77e2f19df3a47b6b1443b6d87c0340585122f7 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1215,6 +1215,11 @@ gint folderview_check_new(Folder *folder)
                                        item->path ? item->path : item->name);
                                continue;
                        }
+                       if (item->scanning == TRUE) {
+                               debug_print("skipping %s, scanning\n",
+                                       item->path ? item->path : item->name);
+                               continue;
+                       }
 
                        str = get_scan_str(item);