2007-11-20 [paul] 3.1.0cvs10

	* src/folder.c
		fix bug 1395, 'Crash on checking for new mails
		while filter is running'
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 8bd8a74154e7a234d9cff9414138c5ea2725b108..1d51133a81513fb17eb706388cca361b285cbef2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-20 [paul]      3.1.0cvs10
+
+       * src/folder.c
+               fix bug 1395, 'Crash on checking for new mails
+               while filter is running'
+               Thanks to Colin
+

 2007-11-20 [paul]      3.1.0cvs9
 
        * src/compose.c
 2007-11-20 [paul]      3.1.0cvs9
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 2f2140eeaa503e331aed2f40933f24e5e1ed68be..77fe59e8f772c1109b48e896cfbbc87351dff27d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3067,3 +3067,4 @@
 ( cvs diff -u -r 1.204.2.151 -r 1.204.2.152 src/prefs_common.c;  cvs diff -u -r 1.103.2.97 -r 1.103.2.98 src/prefs_common.h;  cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.335 -r 1.395.2.336 src/summaryview.c;  ) > 3.1.0cvs7.patchset
 ( cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.336 -r 1.395.2.337 src/summaryview.c;  ) > 3.1.0cvs8.patchset
 ( cvs diff -u -r 1.382.2.424 -r 1.382.2.425 src/compose.c;  ) > 3.1.0cvs9.patchset
 ( cvs diff -u -r 1.204.2.151 -r 1.204.2.152 src/prefs_common.c;  cvs diff -u -r 1.103.2.97 -r 1.103.2.98 src/prefs_common.h;  cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.335 -r 1.395.2.336 src/summaryview.c;  ) > 3.1.0cvs7.patchset
 ( cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.336 -r 1.395.2.337 src/summaryview.c;  ) > 3.1.0cvs8.patchset
 ( cvs diff -u -r 1.382.2.424 -r 1.382.2.425 src/compose.c;  ) > 3.1.0cvs9.patchset

+( cvs diff -u -r 1.213.2.166 -r 1.213.2.167 src/folder.c;  ) > 3.1.0cvs10.patchset

diff --git a/configure.ac b/configure.ac
index ce55a24555b26432c129a35a13af2af51a26312f..87bea9cb227ec8c89e22ea4a0a94a638e82c145f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=9
+EXTRA_VERSION=10

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 6aeb2a24c737be11398dab3786e6ac6723f50215..8d299aeeac79726e844200a1f4c7d40aeb36e148 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -4014,6 +4014,8 @@ void folder_item_apply_processing(FolderItem *item)
        debug_print("processing %s\n", item->name);
        folder_item_update_freeze();
 
        debug_print("processing %s\n", item->name);
        folder_item_update_freeze();
 

+       inc_lock();
+

        mlist = folder_item_get_msg_list(item);
        total = g_slist_length(mlist);
        statusbar_print_all(_("Processing messages..."));
        mlist = folder_item_get_msg_list(item);
        total = g_slist_length(mlist);
        statusbar_print_all(_("Processing messages..."));


@@ -4060,6 +4062,8 @@ void folder_item_apply_processing(FolderItem *item)
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 

+       inc_unlock();
+

        folder_item_update_thaw();
 }
 
        folder_item_update_thaw();
 }