Improve UUID translation in nodes

[pithos-macos] / pithos-macos / PithosAccount.m

diff --git a/pithos-macos/PithosAccount.m b/pithos-macos/PithosAccount.m
index fe5ca8d..0250f15 100644 (file)
--- a/pithos-macos/PithosAccount.m
+++ b/pithos-macos/PithosAccount.m
@@ -214,6 +214,7 @@
         authURL = nil;
         publicURLPrefix = nil;
         loginURLPrefix = nil;
+        userCatalogURL = nil;
 
         @synchronized(self) {
             updatePithos = YES;
@@ -360,20 +361,18 @@
 
 - (PithosAccountNode *)accountNode {
     if (!accountNode) {
-        accountNode = [[PithosAccountNode alloc] initWithPithos:self.pithos];
+        accountNode = [[PithosAccountNode alloc] initWithPithosAccountManager:self andPithos:self.pithos];
         accountNode.childrenUpdatedNotificationName = nil;
         accountNode.inheritChildrenUpdatedNotificationName = YES;
-        accountNode.pithosAccountManager = self;
     }
     return accountNode;
 }
 
 - (PithosSharingAccountsNode *)sharingAccountsNode {
     if (!sharingAccountsNode) {
-        sharingAccountsNode = [[PithosSharingAccountsNode alloc] initWithPithos:self.pithos];
+        sharingAccountsNode = [[PithosSharingAccountsNode alloc] initWithPithosAccountManager:self andPithos:self.pithos];
         sharingAccountsNode.childrenUpdatedNotificationName = nil;
         sharingAccountsNode.inheritChildrenUpdatedNotificationName = YES;
-        sharingAccountsNode.pithosAccountManager = self;
     }
     return sharingAccountsNode;
 }
@@ -391,6 +390,8 @@
         self.syncActive = NO;
         // XXX Show preferences with self as the selected account?
     } else  {
+        [self updateUserCatalogForForDisplaynames:nil UUIDs:[NSArray arrayWithObject:authUser]];
+        
         self.active = YES;
         if (syncDaemon) {
             self.syncDaemon.pithos = self.pithos;
@@ -408,8 +409,6 @@
         }
         if (sharingAccountsNode && self.sharingAccountsNode.children) {
         }
-        
-        [self updateUserCatalogForForDisplaynames:nil UUIDs:[NSArray arrayWithObject:authUser]];
     }
 }