From 94e1d603128ab4220c7a7c9b14ddd2a86cb60746 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 23 Oct 2008 15:35:05 +0000 Subject: [PATCH] Monotone-Parent: 49bc68e8b74862055ad4e2b93e3b0c4b0e791801 Monotone-Revision: a93dd2767c4f017932c6339f82394fd558ef304f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-10-23T15:35:05 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-patchset-r1626.diff | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/SOPE/sope-patchset-r1626.diff b/SOPE/sope-patchset-r1626.diff index 0ddf7d01b..ca2fac4a7 100644 --- a/SOPE/sope-patchset-r1626.diff +++ b/SOPE/sope-patchset-r1626.diff @@ -441,14 +441,14 @@ Index: sope-mime/NGImap4/NGImap4Client.m return [self->normer normalizeSearchResponse:[self processCommand:s]]; } -@@ -1193,6 +1221,79 @@ +@@ -1193,6 +1221,82 @@ /* Private Methods */ +- (NSDictionary *) _sopeSORT: (id)_sortSpec qualifier:(EOQualifier *)_qual encoding:(NSString *)_encoding { -+ + NSMutableDictionary *result; + NSDictionary *d; ++ NSCalendarDate *envDate; + + result = [[[NSMutableDictionary alloc] init] autorelease]; + [result setObject: [NSNumber numberWithBool: NO] forKey: @"result"]; @@ -495,7 +495,10 @@ Index: sope-mime/NGImap4/NGImap4Client.m + } + else + { -+ [dict setObject: [env date] forKey: uid]; ++ envDate = [env date]; ++ if (!envDate) ++ envDate = [NSCalendarDate date]; ++ [dict setObject: envDate forKey: uid]; + b = NO; + } + } @@ -1121,7 +1124,13 @@ Index: sope-mime/NGImap4/ChangeLog =================================================================== --- sope-mime/NGImap4/ChangeLog (révision 1626) +++ sope-mime/NGImap4/ChangeLog (copie de travail) -@@ -1,3 +1,23 @@ +@@ -1,3 +1,29 @@ ++2008-10-23 Wolfgang Sourdeau ++ ++ * NGImap4Client.m ([NGImap -sort:qualifier:encoding:]): message ++ without date that are sorted on servers which do not have the SORT ++ capability are now given the current date as a work-around. ++ +2008-09-22 Wolfgang Sourdeau + + * NGImap4Connection.m ([NGImap -doesMailboxExistAtURL:]): restore