From 00ab31b45449d2276ce43aee9f31a37b9b29b516 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 9 Nov 2008 12:12:29 +0000
Subject: [PATCH] don't append "http" to addresses in the proxy address field

---
 macosx/PrefsController.m  | 18 +++---------------
 macosx/TorrentTableView.m |  4 ++--
 macosx/TrackerTableView.m |  4 ++--
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index f479ce12f..70d41ed0e 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -715,22 +715,10 @@ tr_handle * fHandle;
 - (void) setProxyAddress: (id) sender
 {
     NSString * address = [sender stringValue];
-    BOOL blank = [address isEqualToString: @""];
     
-    if (!blank && [address rangeOfString: @"://"].location == NSNotFound)
-        address = [@"http://" stringByAppendingString: address];
-    
-    if (blank || tr_httpIsValidURL([address UTF8String]))
-    {
-        tr_sessionSetProxy(fHandle, [address UTF8String]);
-        [sender setStringValue: address];
-        [fDefaults setObject: address forKey: @"ProxyAddress"];
-    }
-    else
-    {
-        NSBeep();
-        [sender setStringValue: [fDefaults stringForKey: @"ProxyAddress"]];
-    }
+    tr_sessionSetProxy(fHandle, [address UTF8String]);
+    [sender setStringValue: address];
+    [fDefaults setObject: address forKey: @"ProxyAddress"];
 }
 
 - (void) setProxyPort: (id) sender
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 41a765b0a..56159b942 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -747,10 +747,10 @@
     if (start)
         visibleRect.origin.y += height;
     
-    for (NSInteger i = start ? 1 : 0; i<numberOfRects; i += 2)
+    for (NSInteger i = start ? 1 : 0; i < numberOfRects; i += 2)
     {
         NSRectFill(visibleRect);
-        visibleRect.origin.y += 2 * height;
+        visibleRect.origin.y += 2.0 * height;
     }
     
     [super highlightSelectionInClipRect: clipRect];
diff --git a/macosx/TrackerTableView.m b/macosx/TrackerTableView.m
index df0e5795d..3eaf1d932 100644
--- a/macosx/TrackerTableView.m
+++ b/macosx/TrackerTableView.m
@@ -93,10 +93,10 @@
     if (start)
         visibleRect.origin.y += height;
     
-    for (NSInteger i = start ? 1 : 0; i<numberOfRects; i += 2)
+    for (NSInteger i = start ? 1 : 0; i < numberOfRects; i += 2)
     {
         NSRectFill(visibleRect);
-        visibleRect.origin.y += 2 * height;
+        visibleRect.origin.y += 2.0 * height;
     }
     
     [super highlightSelectionInClipRect: clipRect];