More small changes, including to window placement.

macosx/English.lproj/InfoWindow.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>69 61 356 240 0 0 1152 842 </string>
+	<string>58 51 356 240 0 0 1024 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>549</key>

macosx/English.lproj/MainMenu.nib/info.nib

@@ -13,7 +13,7 @@
 		<key>1603</key>
 		<string>337 545 477 67 0 0 1152 842 </string>
 		<key>29</key>
-		<string>280 699 451 44 0 0 1152 842 </string>
+		<string>229 615 451 44 0 0 1024 746 </string>
 		<key>456</key>
 		<string>340 316 240 225 0 0 1024 746 </string>
 		<key>581</key>
@@ -24,15 +24,13 @@
 	<key>IBFramework Version</key>
 	<string>446.1</string>
 	<key>IBLockedObjects</key>
-	<array>
-		<integer>21</integer>
-	</array>
+	<array/>
 	<key>IBOldestOS</key>
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
 		<integer>21</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8L127</string>

macosx/InfoWindowController.m

@@ -59,14 +59,20 @@
 
 @implementation InfoWindowController
 
+- (id) initWithWindowNibName: (NSString *) name
+{
+    if ((self = [super initWithWindowNibName: name]))
+    {
+        fAppIcon = [[NSApp applicationIconImage] copy];
+        fDotGreen = [NSImage imageNamed: @"GreenDot.tiff"];
+        fDotRed = [NSImage imageNamed: @"RedDot.tiff"];
+        fCheckImage = [NSImage imageNamed: @"NSMenuCheckmark"];    
+    }
+    return self;
+}
+
 - (void) awakeFromNib
 {
-    fAppIcon = [[NSApp applicationIconImage] copy];
-    fDotGreen = [NSImage imageNamed: @"GreenDot.tiff"];
-    fDotRed = [NSImage imageNamed: @"RedDot.tiff"];
-    fCheckImage = [NSImage imageNamed: @"NSMenuCheckmark"];
-    
-    fTorrents = [[NSArray alloc] init];
     fPeers = [[NSMutableArray alloc] initWithCapacity: 30];
     fFiles = [[NSMutableArray alloc] initWithCapacity: 6];
     [fFileTable setDoubleAction: @selector(revealFile:)];
@@ -107,7 +113,8 @@
 
 - (void) updateInfoForTorrents: (NSArray *) torrents
 {
-    [fTorrents release];
+    if (fTorrents)
+        [fTorrents release];
     fTorrents = [torrents retain];
 
     int numberSelected = [fTorrents count];

macosx/MessageWindowController.m

@@ -72,6 +72,8 @@
 
 - (void) awakeFromNib
 {
+    [[self window] center];
+    
     int level = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
     if (level == TR_MSG_ERR)
         [fLevelButton selectItemAtIndex: LEVEL_ERROR];

macosx/PrefsController.m

@@ -68,6 +68,13 @@
         fDefaults = [NSUserDefaults standardUserDefaults];
         fHandle = handle;
         
+        //checks for old version upload speed of -1
+        if ([fDefaults integerForKey: @"UploadLimit"] < 0)
+        {
+            [fDefaults setInteger: 20 forKey: @"UploadLimit"];
+            [fDefaults setBool: NO forKey: @"CheckUpload"];
+        }
+        
         [[self window] update]; //make sure nib is loaded right away
     }
     return self;
@@ -137,13 +144,6 @@
     fNatStatusTimer = [NSTimer scheduledTimerWithTimeInterval: 5.0 target: self
                         selector: @selector(updateNatStatus) userInfo: nil repeats: YES];
     
-    //checks for old version upload speed of -1
-    if ([fDefaults integerForKey: @"UploadLimit"] < 0)
-    {
-        [fDefaults setInteger: 20 forKey: @"UploadLimit"];
-        [fDefaults setBool: NO forKey: @"CheckUpload"];
-    }
-    
     //set upload limit
     BOOL checkUpload = [fDefaults boolForKey: @"CheckUpload"];
     int uploadLimit = [fDefaults integerForKey: @"UploadLimit"];