2007-09-16 [paul] 3.0.0cvs11

* src/folder.c
		do not allow locked msgs to be deleted,
		even by filtering/processing
This commit is contained in:
Paul Mangan 2007-09-16 06:39:17 +00:00
parent 8015dc174a
commit 4adf60efce
4 changed files with 12 additions and 2 deletions

View file

@ -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

View file

@ -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.213.2.159 -r 1.213.2.160 src/folder.c; ) > 3.0.0cvs11.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=0
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=10
EXTRA_VERSION=11
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -3476,9 +3476,12 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
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);
msginfo = msgcache_get_msg(item->cache, num);
if (msginfo != NULL) {
remove_msginfo_from_cache(item, msginfo);
procmsg_msginfo_free(msginfo);