2012-02-10 [pawel] 3.8.0cvs28

	* src/filtering.c
		Fix bug #2598 'Actions can move locked messages'

diff --git a/ChangeLog b/ChangeLog
index 25fe451738667b60aba5c1c8e3ecfcd9f5c155aa..1d520b1fce2cb95c3575d005d7838f01d9728839 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10 [pawel]     3.8.0cvs28
+
+       * src/filtering.c
+               Fix bug #2598 'Actions can move locked messages'
+
 2012-02-08 [pawel]     3.8.0cvs27
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index 8657610d72a1f2ca61dfe863ba6d9b043ab29382..02cc31cd59ea898ececbdafc83141dce17b667c0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4344,3 +4344,4 @@
 ( cvs diff -u -r 1.49.2.140 -r 1.49.2.141 src/procmime.c;  ) > 3.8.0cvs25.patchset
 ( cvs diff -u -r 1.115.2.246 -r 1.115.2.247 src/main.c;  cvs diff -u -r 1.274.2.342 -r 1.274.2.343 src/mainwindow.c;  cvs diff -u -r 1.94.2.226 -r 1.94.2.227 src/messageview.c;  cvs diff -u -r 1.19.2.27 -r 1.19.2.28 src/messageview.h;  cvs diff -u -r 1.204.2.207 -r 1.204.2.208 src/prefs_common.c;  cvs diff -u -r 1.103.2.136 -r 1.103.2.137 src/prefs_common.h;  cvs diff -u -r 1.150.2.121 -r 1.150.2.122 src/procmsg.c;  cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/procmsg.h;  cvs diff -u -r 1.395.2.443 -r 1.395.2.444 src/summaryview.c;  cvs diff -u -r 1.68.2.58 -r 1.68.2.59 src/summaryview.h;  ) > 3.8.0cvs26.patchset
 ( cvs diff -u -r 1.60.2.78 -r 1.60.2.79 src/prefs_actions.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/prefs_actions.h;  cvs diff -u -r 1.30.2.69 -r 1.30.2.70 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/prefs_toolbar.h;  cvs diff -u -r 1.43.2.125 -r 1.43.2.126 src/toolbar.c;  cvs diff -u -r 1.19.2.33 -r 1.19.2.34 src/toolbar.h;  ) > 3.8.0cvs27.patchset
+( cvs diff -u -r 1.60.2.60 -r 1.60.2.61 src/filtering.c;  ) > 3.8.0cvs28.patchset

diff --git a/configure.ac b/configure.ac
index 3abcb91bba6675030e3d90f0dcaee938be24cf05..20efe4c921336d118b1f7aea3094a7d8ba700083 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index 3cdf6f73cfb4fa8a24517eb6d99939c21cc25127..95b5aed65f4e600f861f75f8ee605d299c9b41b7 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -300,6 +300,9 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 
        switch(action->type) {
        case MATCHACTION_MOVE:
+               if (MSG_IS_LOCKED(info->flags))
+                       return FALSE;
+                       
                dest_folder =
                        folder_find_item_from_identifier(action->destination);
                if (!dest_folder) {