merge of '83e14487a68dfb26dd4c9771be79be95a07d6fa4'

and 'c2e4ca001f8f7121d1f4f09f13ba336f2bd1cef7'

Monotone-Parent: 83e14487a68dfb26dd4c9771be79be95a07d6fa4
Monotone-Parent: c2e4ca001f8f7121d1f4f09f13ba336f2bd1cef7
Monotone-Revision: bce92d5d3cf0a781944fc96a15b832a767285d0f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-09-29T15:47:53
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-09-29 15:47:53 +00:00
commit c5096d72f1
1 changed files with 2 additions and 4 deletions

View File

@ -132,13 +132,11 @@ static Class SOGoMailFolderK;
- (id) initWithSOGoObject: (id) newSOGoObject
inContainer: (MAPIStoreObject *) newContainer
{
NSURL *propsURL;
NSString *urlString;
if ((self = [super initWithSOGoObject: newSOGoObject inContainer: newContainer]))
{
urlString = [[self url] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
propsURL = [NSURL URLWithString: urlString];
ASSIGN (versionsMessage,
[SOGoMAPIFSMessage objectWithName: @"versions.plist"
inContainer: propsFolder]);
@ -727,7 +725,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
uint64_t modseq;
NSDictionary *versionProperties, *status;
NSMutableDictionary *messages, *mapping;
NSNumber *newChangeNumNbr, *highestModseq;
NSNumber *newChangeNumNbr; // , *highestModseq;
uint64_t newChangeNum;
NSUInteger count, max;
@ -741,7 +739,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
status
= [sogoObject
statusForFlags: [NSArray arrayWithObject: @"HIGHESTMODSEQ"]];
highestModseq = [status objectForKey: @"highestmodseq"];
// highestModseq = [status objectForKey: @"highestmodseq"];
versionProperties = [versionsMessage properties];
messages = [versionProperties objectForKey: @"Messages"];