From c5e1b23a7a0b3315a9eca325359d1f42a79fc632 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 2 Dec 2011 17:14:50 +0000 Subject: [PATCH] Monotone-Parent: d7078410ff174b441e08902d0d87364ea464be95 Monotone-Revision: 2a01eb91060e570b3c80b7c6f5cfc53ea0e7f0d6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-12-02T17:14:50 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ OpenChange/MAPIStoreFSMessage.m | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index be22b7b30..e41af375a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-12-02 Wolfgang Sourdeau + * OpenChange/MAPIStoreFSMessage.m (-subscriberCanModifyMessage): + handle the case where the message is being created. + * OpenChange/MAPIStoreFSFolder.m (-messageKeysMatchingQualifier:andSortOrderings:): ensure the active user can read the folder messages before returning them. diff --git a/OpenChange/MAPIStoreFSMessage.m b/OpenChange/MAPIStoreFSMessage.m index 161359e8b..8af3edca2 100644 --- a/OpenChange/MAPIStoreFSMessage.m +++ b/OpenChange/MAPIStoreFSMessage.m @@ -105,7 +105,10 @@ - (BOOL) subscriberCanModifyMessage { - return ([(MAPIStoreFolder *) container subscriberCanModifyMessages] + return ((isNew + && [(MAPIStoreFolder *) container subscriberCanCreateMessages]) + || (!isNew + && [(MAPIStoreFolder *) container subscriberCanModifyMessages]) || [self _messageIsFreeBusy]); }