Monotone-Parent: 4e23e038f2b0b7eddf8b30700b8c9a8910768f98

Monotone-Revision: 9235e5dc4d151a3cba8ad842ac39e1b2d18c8201

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-29T19:55:21
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreFSFolder.m

@@ -34,6 +34,7 @@
 #import "MAPIStoreFSMessage.h"
 #import "MAPIStoreFSMessageTable.h"
 #import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "SOGoMAPIFSFolder.h"
 #import "SOGoMAPIFSMessage.h"
 
@@ -64,20 +65,6 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
   EOKeyValueQualifierK = [EOKeyValueQualifier class];
 }
 
-- (id) initWithURL: (NSURL *) newURL
-         inContext: (MAPIStoreContext *) newContext
-{
-  if ((self = [super initWithURL: newURL
-                       inContext: newContext]))
-    {
-      sogoObject = [SOGoMAPIFSFolder folderWithURL: newURL
-                                      andTableType: MAPISTORE_MESSAGE_TABLE];
-      [sogoObject retain];
-    }
-
-  return self;
-}
-
 - (MAPIStoreMessageTable *) messageTable
 {
   return [MAPIStoreFSMessageTable tableForContainer: self];
@@ -126,8 +113,10 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
                           andSortOrderings: (NSArray *) sortOrderings
 {
   NSArray *keys;
+  SOGoUser *ownerUser;
 
-  if ([[context activeUser] isEqual: [context ownerUser]]
+  ownerUser = [[self userContext] sogoUser];
+  if ([[context activeUser] isEqual: ownerUser]
       || [self subscriberCanReadMessages])
     keys = [(SOGoMAPIFSFolder *) sogoObject
               toOneRelationshipKeysMatchingQualifier: qualifier