Revision 46b46b83 pithos-macos/PithosContainerNode.m

b/pithos-macos/PithosContainerNode.m
205 205
    }
206 206
}
207 207

  
208
- (void)setLimitedPithosContainer:(ASIPithosContainer *)aPithosContainer {
209
    if (![pithosContainer isEqualTo:aPithosContainer]) {
210
        self.pithosContainer.name = aPithosContainer.name;
211
        self.pithosContainer.count = aPithosContainer.count;
212
        self.pithosContainer.bytes = aPithosContainer.bytes;
213
        self.pithosContainer.lastModified = aPithosContainer.lastModified;
214
        self.pithosContainer.untilTimestamp = aPithosContainer.untilTimestamp;
215
        if (!pithosNodeInfoController) {
216
            self.pithosContainer.policy = aPithosContainer.policy;
217
            self.pithosContainer = pithosContainer;
218
        }
219
    }
220
}
221

  
208 222
#pragma mark -
209 223
#pragma mark ASIHTTPRequestDelegate
210 224

  
......
287 301
                                        // Use the same pointer value, if possible
288 302
                                        node = [children objectAtIndex:oldIndex];
289 303
                                        node.pithosContainer = pithosContainer;
290
                                        node.pithosObject = object;
304
//                                        node.pithosObject = object;
305
                                        [node setLimitedPithosObject:object];
291 306
                                        [keptNodes addIndex:oldIndex];
292 307
                                    }
293 308
                                }
......
308 323
                                    // Use the same pointer value, if possible
309 324
                                    node = [children objectAtIndex:oldIndex];
310 325
                                    node.pithosContainer = pithosContainer;
311
                                    node.pithosObject = object;
326
//                                    node.pithosObject = object;
327
                                    [node setLimitedPithosObject:object];
312 328
                                    [keptNodes addIndex:oldIndex];
313 329
                                }
314 330
                            }
......
326 342
                                    // Use the same pointer value, if possible
327 343
                                    node = [children objectAtIndex:oldIndex];
328 344
                                    node.pithosContainer = pithosContainer;
329
                                    node.pithosObject = object;
345
//                                    node.pithosObject = object;
346
                                    [node setLimitedPithosObject:object];
330 347
                                    [keptNodes addIndex:oldIndex];
331 348
                                }
332 349
                            }
......
513 530
#pragma mark Actions
514 531

  
515 532
- (void)showPithosNodeInfo:(id)sender {
516
    if (!pithosNodeInfoController)
533
    if (!pithosNodeInfoController) {
517 534
        pithosNodeInfoController = [[PithosContainerNodeInfoController alloc] initWithPithosNode:self];
535
        [self refreshInfo];
536
    }
518 537
    [pithosNodeInfoController showWindow:sender];
519 538
    [[pithosNodeInfoController window] makeKeyAndOrderFront:sender];
520 539
    [NSApp activateIgnoringOtherApps:YES];

Also available in: Unified diff