Changeset 5210

Timestamp:

02/01/08 09:53:48 (9 months ago)

Author:

morris

Message:

Move removal of progress bar to transfer removal, from transfer deallocation

Files:

• WiredClient/trunk/WCTransfer.m (modified) (1 diff)
• WiredClient/trunk/WCTransferCell.m (modified) (1 diff)
• WiredClient/trunk/WCTransfers.m (modified) (9 diffs)

WiredClient/trunk/WCTransfer.m

@@ -89 +89 @@
-        [_icon release];
-        
-        [_progressIndicator removeFromSuperview];
-        [_progressIndicator release];
-

WiredClient/trunk/WCTransferCell.m

@@ -152 +152 @@
-        } else {
-                if([progressIndicator superview])
-WithoutNeedingDisplay
+
-        }
-

WiredClient/trunk/WCTransfers.m

@@ -73 +73 @@
-- (void)_startTransfer:(WCTransfer *)transfer;
-- (void)_finishTransfer:(WCTransfer *)transfer;
+- (void)_removeTransfer:(WCTransfer *)transfer;
-- (void)_reloadFiles:(NSDictionary *)dictionary;
-
@@ -498 +499 @@
-
-                        if([WCSettings boolForKey:WCRemoveTransfers])
-_transfers removeObject
+self _removeTransfer
-
-                        [_transfersTableView reloadData];
@@ -541 +542 @@
-                }
-                else if(state == WCTransferRemoving) {
-_transfers removeObject
+self _removeTransfer
-                }
-                
@@ -556 +557 @@
-        [file release];
-        [path release];
+}
+
+
+
+- (void)_removeTransfer:(WCTransfer *)transfer {
+        [[transfer progressIndicator] removeFromSuperview];
+
+        [_transfers removeObject:transfer];
-}
-
@@ -1299 +1308 @@
-                [self _presentError:error];
-
-_transfers removeObject
+self _removeTransfer
-                [_transfersTableView reloadData];
-        } else {
@@ -1373 +1382 @@
-        } else {
-                if([WCSettings boolForKey:WCRemoveTransfers]) {
-_transfers removeObject
+self _removeTransfer
-                } else {
-                        [transfer setState:WCTransferFinished];
@@ -1432 +1441 @@
-        } else {
-                if([WCSettings boolForKey:WCRemoveTransfers]) {
-_transfers removeObject
+self _removeTransfer
-                } else {
-                        [transfer setState:WCTransferFinished];
@@ -1560 +1569 @@
-        if([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) {
-                while((transfer = [self _transferWithState:WCTransferFinished]))
-
-
+
-        } else {
-                transfer = [self _selectedTransfer];
@@ -1568 +1576 @@
-                        [transfer setState:WCTransferRemoving];
-                else
-_transfers removeObject
+self _removeTransfer
-        }
-