From 842e7ff57017fef7c8c27f2b57885b115ca50df9 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 6 Feb 2008 16:20:59 +0000 Subject: [PATCH] Monotone-Parent: e706312f04004672d2c8a80c8ec43cf3313c6244 Monotone-Revision: afc6dcc4b6248dc2121bb03e339daca4db855f85 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-02-06T16:20:59 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoGCSFolder.m | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f10dec33..7b1fda531 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-02-06 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder -ocsFolder]): + send an email only when not in a dav request. + ([SOGoGCSFolder -delete]): same as above. + * SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount -supportsQuotas]): test quota support by querying the server capability. diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 7b8732397..68f614230 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -273,7 +273,10 @@ static BOOL sendFolderAdvisories = NO; withName: displayName atPath: ocsPath]; - if (!result && sendFolderAdvisories) [self sendFolderAdvisoryTemplate: @"Addition"]; + if (!result + && [[context request] handledByDefaultHandler] + && sendFolderAdvisories) + [self sendFolderAdvisoryTemplate: @"Addition"]; return (result == nil); } @@ -291,7 +294,9 @@ static BOOL sendFolderAdvisories = NO; else error = [[self folderManager] deleteFolderAtPath: ocsPath]; - if (!error && sendFolderAdvisories) [self sendFolderAdvisoryTemplate: @"Removal"]; + if (!error && sendFolderAdvisories + && [[context request] handledByDefaultHandler]) + [self sendFolderAdvisoryTemplate: @"Removal"]; return error; }