2007-09-16 [paul] 3.0.0cvs11

	* src/folder.c
		do not allow locked msgs to be deleted,
		even by filtering/processing

diff --git a/ChangeLog b/ChangeLog
index 3d5800a6a1852f15e379e3ccac8fdef8214054b3..4376a90063095f933522f68ca316857cc6ff336c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-16 [paul]      3.0.0cvs11
+
+       * src/folder.c
+               do not allow locked msgs to be deleted,
+               even by filtering/processing
+

 2007-09-07 [paul]      3.0.0cvs10
 
        * src/prefs_folder_column.c
 2007-09-07 [paul]      3.0.0cvs10
 
        * src/prefs_folder_column.c

diff --git a/PATCHSETS b/PATCHSETS
index e7cf1965976dd6ea1141f5d2ed0a5579d3b204eb..87ad8d4268307dc5612ab066941b1bd1b309659f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2856,3 +2856,4 @@
 ( cvs diff -u -r 1.149.2.81 -r 1.149.2.82 src/inc.c;  ) > 3.0.0cvs8.patchset
 ( cvs diff -u -r 1.10.2.34 -r 1.10.2.35 src/prefs_gtk.c;  ) > 3.0.0cvs9.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_folder_column.c;  cvs diff -u -r 1.10.2.19 -r 1.10.2.20 src/prefs_summary_column.c;  ) > 3.0.0cvs10.patchset
 ( cvs diff -u -r 1.149.2.81 -r 1.149.2.82 src/inc.c;  ) > 3.0.0cvs8.patchset
 ( cvs diff -u -r 1.10.2.34 -r 1.10.2.35 src/prefs_gtk.c;  ) > 3.0.0cvs9.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_folder_column.c;  cvs diff -u -r 1.10.2.19 -r 1.10.2.20 src/prefs_summary_column.c;  ) > 3.0.0cvs10.patchset

+( cvs diff -u -r 1.213.2.159 -r 1.213.2.160 src/folder.c;  ) > 3.0.0cvs11.patchset

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

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 6702a5f3032e1c812fab3e28e2641fcd9931b2d2..37298165744b31a4988f098213b857c6181b6c1b 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -3476,9 +3476,12 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 
        if (!item->cache) folder_item_read_cache(item);
 
 
        if (!item->cache) folder_item_read_cache(item);
 

+       msginfo = msgcache_get_msg(item->cache, num);
+       if (MSG_IS_LOCKED(msginfo->flags))
+               return -1;
+

        ret = folder->klass->remove_msg(folder, item, num);
 
        ret = folder->klass->remove_msg(folder, item, num);
 

-       msginfo = msgcache_get_msg(item->cache, num);

        if (msginfo != NULL) {
                remove_msginfo_from_cache(item, msginfo);
                procmsg_msginfo_free(msginfo);
        if (msginfo != NULL) {
                remove_msginfo_from_cache(item, msginfo);
                procmsg_msginfo_free(msginfo);