From 798fa18fd532f1f22a99459999f68115c580c813 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 8 Jul 2011 20:07:21 +0000
Subject: [PATCH] Monotone-Parent: 39e4d66894e1c585c6ce895bdcf629c4e6c0999e
 Monotone-Revision: 670e8f293b27c9b0facc77f826ad167762e8a067

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-08T20:07:21
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  6 ++++++
 OpenChange/MAPIStoreMailFolder.h |  4 ++--
 OpenChange/MAPIStoreMailFolder.m | 19 ++++++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0c847330..fe4755dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-07-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailFolder.m (-lastMessageModificationTime):
+	implemented method by making use of the new -[SOGoMailFolder
+	mostRecentMessageDate] message, which is currently a more or less
+	precise way to obtain the mailbox's last modification date.
+	(-lastModificationTime): removed method.
+
 	* OpenChange/MAPIStoreObject.m (-setMAPIRetainCount:)
 	(-mapiRetainCount:): moved methods from MAPIStoreMessage.
 
diff --git a/OpenChange/MAPIStoreMailFolder.h b/OpenChange/MAPIStoreMailFolder.h
index ef0cb9901..12440cb4e 100644
--- a/OpenChange/MAPIStoreMailFolder.h
+++ b/OpenChange/MAPIStoreMailFolder.h
@@ -53,8 +53,8 @@
 @interface MAPIStoreDraftsFolder : MAPIStoreMailFolder
 @end
 
-@interface MAPIStoreDeletedItemsFolder : MAPIStoreMailFolder
-@end
+// @interface MAPIStoreDeletedItemsFolder : MAPIStoreFFolder
+// @end
 
 @interface MAPIStoreOutboxFolder : MAPIStoreMailFolder
 @end
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index c14f1660e..577120a19 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -273,9 +274,9 @@ static Class SOGoMailFolderK;
   return [NSCalendarDate dateWithTimeIntervalSince1970: 0x4dbb2dbe]; /* oc_version_time */
 }
 
-- (NSCalendarDate *) lastModificationTime
+- (NSDate *) lastMessageModificationTime
 {
-  return [NSCalendarDate date];
+  return [sogoObject mostRecentMessageDate];
 }
 
 @end
@@ -310,15 +311,15 @@ static Class SOGoMailFolderK;
 
 @end
 
-@implementation MAPIStoreDeletedItemsFolder : MAPIStoreMailFolder
+// @implementation MAPIStoreDeletedItemsFolder : MAPIStoreMailFolder
 
-- (SOGoMailFolder *) specialFolderFromAccount: (SOGoMailAccount *) accountFolder
-                                    inContext: (WOContext *) woContext
-{
-  return [accountFolder trashFolderInContext: woContext];
-}
+// - (SOGoMailFolder *) specialFolderFromAccount: (SOGoMailAccount *) accountFolder
+//                                     inContext: (WOContext *) woContext
+// {
+//   return [accountFolder trashFolderInContext: woContext];
+// }
 
-@end
+// @end
 
 @implementation MAPIStoreOutboxFolder : MAPIStoreMailFolder