Monotone-Parent: d6049f3e55fa0ac4385db63c3777aa1d84d5511c

Monotone-Revision: 3fdbf80f4c1de08138ff9435f54fd9f663ef5b8f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-20T14:13:56
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreAppointmentWrapper.h

@@ -121,8 +121,8 @@
                    inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getPidLidIndentedBusyStatus: (void **) data // TODO
                            inMemCtx: (TALLOC_CTX *) memCtx;
-- (int) getPidTagSubject: (void **) data // SUMMARY
-            inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPidTagNormalizedSubject: (void **) data // SUMMARY
+                          inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getPidLidLocation: (void **) data // LOCATION
                  inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions

OpenChange/MAPIStoreAppointmentWrapper.m

@@ -963,8 +963,8 @@ static NSCharacterSet *hexCharacterSet = nil;
   return [self getPidLidBusyStatus: data inMemCtx: memCtx];
 }
 
-- (int) getPidTagSubject: (void **) data // SUMMARY
-            inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagNormalizedSubject: (void **) data // SUMMARY
+                          inMemCtx: (TALLOC_CTX *) memCtx
 {
   *data = [[event summary] asUnicodeInMemCtx: memCtx];
 

OpenChange/MAPIStoreContactsMessage.m

@@ -180,8 +180,8 @@
   return MAPISTORE_SUCCESS;
 }
 
-- (int) getPidTagSubject: (void **) data
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagNormalizedSubject: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
 {
   return [self getPidTagDisplayName: data inMemCtx: memCtx];
 }

OpenChange/MAPIStoreDBMessage.m

@@ -127,23 +127,6 @@
   return rc;
 }
 
-- (int) getPidTagSubject: (void **) data
-                inMemCtx: (TALLOC_CTX *) memCtx
-{
-  id value;
-  int rc;
- 
-  value = [properties
-            objectForKey: MAPIPropertyKey (PidTagNormalizedSubject)];
-  if (value)
-    rc = [value getValue: data forTag: PidTagNormalizedSubject
-                inMemCtx: memCtx];
-  else
-    rc = MAPISTORE_ERR_NOT_FOUND;
-
-  return rc;
-}
-
 - (void) addProperties: (NSDictionary *) newNewProperties
 {
   [sogoObject reloadIfNeeded];

OpenChange/MAPIStoreMailMessage.m

@@ -448,19 +448,6 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
   return MAPISTORE_SUCCESS;
 }
 
-- (int) getPidTagSubject: (void **) data
-                inMemCtx: (TALLOC_CTX *) memCtx
-{
-  NSString *stringValue;
-
-  stringValue = [self subject];
-  if (!stringValue)
-    stringValue = @"";
-  *data = [stringValue asUnicodeInMemCtx: memCtx];
-
-  return MAPISTORE_SUCCESS;
-}
-
 - (int) getPidTagSubjectPrefix: (void **) data
                       inMemCtx: (TALLOC_CTX *) memCtx
 {

OpenChange/MAPIStoreMailVolatileMessage.m

@@ -285,13 +285,6 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
           : ULLONG_MAX);
 }
 
-- (int) getPidTagSubject: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
-{
-  /* if we get here, it means that the properties file didn't contain a
-     relevant value */
-  return [self getEmptyString: data inMemCtx: memCtx];
-}
-
 - (int) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
   *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];

OpenChange/MAPIStoreTasksMessage.m

@@ -91,8 +91,8 @@
   return MAPISTORE_SUCCESS;
 }
 
-- (int) getPidTagSubject: (void **) data // SUMMARY
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (int) getPidTagNormalizedSubject: (void **) data // SUMMARY
+                          inMemCtx: (TALLOC_CTX *) memCtx
 {
   iCalToDo *task;