Changeset 7080

Timestamp:

Nov 9, 2008, 12:12:29 PM (12 years ago)

Author:

livings124

Message:

don't append "http" to addresses in the proxy address field

Location:

trunk/macosx

Files:

• PrefsController.m (modified) (1 diff)
• TorrentTableView.m (modified) (1 diff)
• TrackerTableView.m (modified) (1 diff)

trunk/macosx/PrefsController.m

@@ -716 +716 @@
 {
     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"];
 }
 

trunk/macosx/TorrentTableView.m

@@ -748 +748 @@
         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;
     }
     

trunk/macosx/TrackerTableView.m

@@ -94 +94 @@
         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;
     }