From 3ad93f3257d8c0a1b8ca4056b0b00d58554be7a0 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 16 Mar 2012 20:51:51 +0000
Subject: [PATCH] Monotone-Parent: 0d1809a8a5fbb980e78d197e8f5c0c634b960a2e
 Monotone-Revision: cd4c34d79c62c8b6a1f9ccfb14ea9a79442034c6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-16T20:51:51
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  6 ++++++
 OpenChange/MAPIStoreGCSFolder.m  | 19 ++-----------------
 OpenChange/MAPIStoreMailFolder.m | 19 ++-----------------
 OpenChange/NSData+MAPIStore.h    |  3 +++
 OpenChange/NSData+MAPIStore.m    | 17 +++++++++++++++++
 5 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61fc3d51a..88eb73a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m
index b27e0a24f..74c784c93 100644
--- a/OpenChange/MAPIStoreGCSFolder.m
+++ b/OpenChange/MAPIStoreGCSFolder.m
@@ -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];
         }
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 23c55ec97..93fe1aee8 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -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];
         }
diff --git a/OpenChange/NSData+MAPIStore.h b/OpenChange/NSData+MAPIStore.h
index fd56f0389..20409c1ac 100644
--- a/OpenChange/NSData+MAPIStore.h
+++ b/OpenChange/NSData+MAPIStore.h
@@ -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)
diff --git a/OpenChange/NSData+MAPIStore.m b/OpenChange/NSData+MAPIStore.m
index e9fe04076..b0143dc1b 100644
--- a/OpenChange/NSData+MAPIStore.m
+++ b/OpenChange/NSData+MAPIStore.m
@@ -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)