Monotone-Parent: 1446e7383727bc0d371dfafcec06697f030f7117

Monotone-Revision: 7f4c04f0c1883efb437cd0189f442b20c0063c82

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-20T19:47:58
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreMailFolder.m

@@ -61,7 +61,7 @@
 
 #import "MAPIStoreMailFolder.h"
 
-static Class SOGoMailFolderK;
+static Class SOGoMailFolderK, MAPIStoreOutboxFolderK;
 
 #undef DEBUG
 #include <util/attr.h>
@@ -74,6 +74,7 @@ static Class SOGoMailFolderK;
 + (void) initialize
 {
   SOGoMailFolderK = [SOGoMailFolder class];
+  MAPIStoreOutboxFolderK = [MAPIStoreOutboxFolder class];
   [MAPIStoreAppointmentWrapper class];
 }
 
@@ -113,7 +114,10 @@ static Class SOGoMailFolderK;
 
   key = MAPIPropertyKey (PR_DISPLAY_NAME_UNICODE);
   newDisplayName = [newProperties objectForKey: key];
-  if (newDisplayName)
+  if (newDisplayName
+      && ![self isKindOfClass: MAPIStoreOutboxFolderK]
+      && ![[(SOGoMailFolder *) sogoObject displayName]
+            isEqualToString: newDisplayName])
     {
       [(SOGoMailFolder *) sogoObject renameTo: newDisplayName];
       propsCopy = [newProperties mutableCopy];
@@ -1078,3 +1082,15 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
 }
 
 @end
+
+@implementation MAPIStoreOutboxFolder
+
+- (int) getPrDisplayName: (void **) data
+                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [@"Outbox" asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+@end