From e03c67782833c15ac7421b95a64a2f661febf669 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 16 Sep 2007 00:40:15 +0000
Subject: [PATCH] fix small memory leak that has been around forever

---
 macosx/Controller.m           | 5 ++---
 macosx/InfoWindowController.m | 8 ++++----
 macosx/PrefsController.m      | 2 +-
 macosx/Torrent.m              | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 1472a1372..ae4aa3904 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2647,8 +2647,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
 
 - (void) doNothing: (id) sender {}
 
-- (NSToolbarItem *) toolbar: (NSToolbar *) t itemForItemIdentifier:
-    (NSString *) ident willBeInsertedIntoToolbar: (BOOL) flag
+- (NSToolbarItem *) toolbar: (NSToolbar *) t itemForItemIdentifier: (NSString *) ident willBeInsertedIntoToolbar: (BOOL) flag
 {
     NSToolbarItem * item = [[NSToolbarItem alloc] initWithItemIdentifier: ident];
 
@@ -2743,7 +2742,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         return nil;
     }
 
-    return item;
+    return [item autorelease];
 }
 
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) t
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 862be281d..652377148 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -792,13 +792,13 @@
             return [[peer objectForKey: @"Connected"] boolValue] ? fDotGreen : fDotRed;
         else if ([ident isEqualToString: @"Encryption"])
         {
-            /*if ([[peer objectForKey: @"Encryption"] boolValue])
+            if ([[peer objectForKey: @"Encryption"] boolValue])
             {
                 if (!fLockImage)
                     fLockImage = [NSImage imageNamed: @"Lock.tiff"];
                 return fLockImage;
             }
-            else*/
+            else
                 return nil;
         }
         else if ([ident isEqualToString: @"Client"])
@@ -863,8 +863,8 @@
                                     NSLocalizedString(@"Progress: %.1f%%", "Inspector -> Peers tab -> table row tooltip"),
                                     [[peer objectForKey: @"Progress"] floatValue] * 100.0]];
             
-            /*if ([[peer objectForKey: @"Encryption"] boolValue])
-                [components addObject: NSLocalizedString(@"Encrypted Connection", "Inspector -> Peers tab -> table row tooltip")];*/
+            if ([[peer objectForKey: @"Encryption"] boolValue])
+                [components addObject: NSLocalizedString(@"Encrypted Connection", "Inspector -> Peers tab -> table row tooltip")];
         }
         
         int port;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 9906b1bf5..5f53600de 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -209,7 +209,7 @@
         return nil;
     }
 
-    return item;
+    return [item autorelease];
 }
 
 - (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *) toolbar
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index feb8387b5..ae0c1cd12 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1039,7 +1039,7 @@ static int static_lastid = 0;
             if (peer->isUploading)
                 [dic setObject: [NSNumber numberWithFloat: peer->downloadFromRate] forKey: @"DL From Rate"];
             
-            //[dic setObject: [NSNumber numberWithBool: peer->isEncrypted] forKey: @"Encryption"];
+            [dic setObject: [NSNumber numberWithBool: /*peer->isEncrypted*/NO] forKey: @"Encryption"];
             
             [dic setObject: [NSString stringWithCString: (char *) peer->client encoding: NSUTF8StringEncoding] forKey: @"Client"];
         }