amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-20 06:03:20 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 0d1809a8a5fbb980e78d197e8f5c0c634b960a2e

Browse Source 
Monotone-Revision: cd4c34d79c62c8b6a1f9ccfb14ea9a79442034c6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-16T20:51:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-03-16 20:51:51 +00:00
parent 38e085ae8f
commit 3ad93f3257
5 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2012-03-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/NSData+MAPIStore.m (+dataWithChangeKeyGUID:andCnt:):
new method replacing _dataFromChangeKeyGUID:andCnt: from
MAPIStore{GCS,Mail}Folder.
2012-03-16 Jean Raby <jraby@inverse.ca>
* sogo.spec debian/sogo.postint: upon installation, update timestamp
OpenChange/MAPIStoreGCSFolder.m
+2 -17
View File
@@ -497,21 +497,6 @@ static Class NSNumberK;
[versionsMessage save];
}
- (NSData *) _dataFromChangeKeyGUID: (NSString *) guidString
andCnt: (NSData *) globCnt
{
NSMutableData *changeKey;
struct GUID guid;
changeKey = [NSMutableData dataWithCapacity: 16 + [globCnt length]];
[guidString extractGUID: &guid];
[changeKey appendData: [NSData dataWithGUID: &guid]];
[changeKey appendData: globCnt];
return changeKey;
}
- (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey
{
NSDictionary *messages, *changeKeyDict;
@@ -525,7 +510,7 @@ static Class NSNumberK;
{
guid = [changeKeyDict objectForKey: @"GUID"];
globCnt = [changeKeyDict objectForKey: @"LocalId"];
changeKey = [self _dataFromChangeKeyGUID: guid andCnt: globCnt];
changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
}
return changeKey;
@@ -554,7 +539,7 @@ static Class NSNumberK;
{
guid = [keys objectAtIndex: count];
globCnt = [changeListDict objectForKey: guid];
changeKey = [self _dataFromChangeKeyGUID: guid andCnt: globCnt];
changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
[changeKeys appendUInt8: [changeKey length]];
[changeKeys appendData: changeKey];
}
OpenChange/MAPIStoreMailFolder.m
+2 -17
View File
@@ -686,21 +686,6 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
[versionsMessage save];
}
- (NSData *) _dataFromChangeKeyGUID: (NSString *) guidString
andCnt: (NSData *) globCnt
{
NSMutableData *changeKey;
struct GUID guid;
changeKey = [NSMutableData dataWithCapacity: 16 + [globCnt length]];
[guidString extractGUID: &guid];
[changeKey appendData: [NSData dataWithGUID: &guid]];
[changeKey appendData: globCnt];
return changeKey;
}
- (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey
{
NSDictionary *messages, *changeKeyDict;
@@ -716,7 +701,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
{
guid = [changeKeyDict objectForKey: @"GUID"];
globCnt = [changeKeyDict objectForKey: @"LocalId"];
changeKey = [self _dataFromChangeKeyGUID: guid andCnt: globCnt];
changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
}
return changeKey;
@@ -747,7 +732,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
{
guid = [keys objectAtIndex: count];
globCnt = [changeListDict objectForKey: guid];
changeKey = [self _dataFromChangeKeyGUID: guid andCnt: globCnt];
changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
[changeKeys appendUInt8: [changeKey length]];
[changeKeys appendData: changeKey];
}
OpenChange/NSData+MAPIStore.h
+3
View File
@@ -42,6 +42,9 @@
+ (id) dataWithXID: (const struct XID *) xid;
- (struct XID *) asXIDInMemCtx: (void *) memCtx;
+ (id) dataWithChangeKeyGUID: (NSString *) guidString
andCnt: (NSData *) globCnt;
@end
@interface NSMutableData (MAPIStoreDataTypes)
OpenChange/NSData+MAPIStore.m
+17
View File
@@ -20,6 +20,8 @@
* Boston, MA 02111-1307, USA.
*/
#import "NSString+MAPIStore.h"
#import "NSData+MAPIStore.h"
#undef DEBUG
@@ -168,6 +170,21 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID *
return xid;
}
+ (id) dataWithChangeKeyGUID: (NSString *) guidString
andCnt: (NSData *) globCnt;
{
NSMutableData *changeKey;
struct GUID guid;
changeKey = [NSMutableData dataWithCapacity: 16 + [globCnt length]];
[guidString extractGUID: &guid];
[changeKey appendData: [NSData dataWithGUID: &guid]];
[changeKey appendData: globCnt];
return changeKey;
}
@end
@implementation NSMutableData (MAPIStoreDataTypes)