"web seeds", not "web seeders"

diff --git a/macosx/English.lproj/InfoWindow.xib b/macosx/English.lproj/InfoWindow.xib
index 16d4898bc65221094bad091da2d0363fa2a68378..3e3c0b6ed1f92636b9ef47899471d85482209684 100644 (file)
--- a/macosx/English.lproj/InfoWindow.xib
+++ b/macosx/English.lproj/InfoWindow.xib
@@ -8,7 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">352.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="1766"/>
+                       <integer value="1770"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3941,7 +3941,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                                <object class="_NSCornerView" key="NSCornerView" id="336297981">
                                                                                        <reference key="NSNextResponder" ref="252354812"/>
                                                                                        <int key="NSvFlags">-2147483392</int>
-                                                                                       <string key="NSFrame">{{328, 0}, {12, 17}}</string>
+                                                                                       <string key="NSFrame">{{-22, 0}, {12, 17}}</string>
                                                                                        <reference key="NSSuperview" ref="252354812"/>
                                                                                </object>
                                                                                <object class="NSMutableArray" key="NSTableColumns">
@@ -3954,7 +3954,7 @@ zijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE00VXRddGW
                                                                                                <object class="NSTableHeaderCell" key="NSHeaderCell">
                                                                                                        <int key="NSCellFlags">67239424</int>
                                                                                                        <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents">Web Seeders</string>
+                                                                                                       <string key="NSContents">Web Seeds</string>
                                                                                                        <reference key="NSSupport" ref="26"/>
                                                                                                        <reference key="NSBackgroundColor" ref="665452585"/>
                                                                                                        <reference key="NSTextColor" ref="390741217"/>

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 5f89292b41ddb3528ec257e08b76108ede2b1eaa..7a2147110532f5b6dc11c2bb657db597c0c881c1 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -465,7 +465,7 @@ typedef enum
         [fPiecesControl setEnabled: YES];
         [fPiecesView setTorrent: torrent];
         
-        //get webseeders for table - if no webseeds for this torrent, clear the table
+        //get webseeds for table - if no webseeds for this torrent, clear the table
         BOOL hasWebSeeds = [torrent webSeedCount] > 0;
         [self setWebSeederTableHidden: !hasWebSeeds animate: YES];
         if (!hasWebSeeds)
@@ -1475,7 +1475,7 @@ typedef enum
     if ([torrent webSeedCount] > 0)
     {
         [fWebSeeds release];
-        fWebSeeds = [[[torrent webSeeders] sortedArrayUsingDescriptors: [fWebSeedTable sortDescriptors]] retain];
+        fWebSeeds = [[[torrent webSeeds] sortedArrayUsingDescriptors: [fWebSeedTable sortDescriptors]] retain];
         [fWebSeedTable reloadData];
     }
 }

diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index f2821bf3937133dc6e9644c97cd5b68fb0995edc..16d2940fdeb034a6cc2d0453a59210013e8a85a8 100644 (file)
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -191,7 +191,7 @@ typedef enum
 - (NSArray *) peers;
 
 - (NSUInteger) webSeedCount;
-- (NSArray *) webSeeders;
+- (NSArray *) webSeeds;
 
 - (NSString *) progressString;
 - (NSString *) statusString;

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 2f954d6e5aaf110e14834d335f76cb37f33b0178..532f14092b9bbc2ce8f0c40bf1b966520f9af0ef 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1021,10 +1021,10 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     return fInfo->webseedCount;
 }
 
-- (NSArray *) webSeeders
+- (NSArray *) webSeeds
 {
     int webSeedCount = fInfo->webseedCount, i;
-    NSMutableArray * webSeeders = [NSMutableArray arrayWithCapacity: webSeedCount];
+    NSMutableArray * webSeeds = [NSMutableArray arrayWithCapacity: webSeedCount];
     
     for (i = 0; i < webSeedCount; i++)
     {
@@ -1032,13 +1032,13 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
         
         [dict setObject: [NSString stringWithUTF8String: fInfo->webseeds[i]] forKey: @"Address"];
         
-        /*if (webSeeders->isDownloadingFrom)
+        /*if (webSeeds->isDownloadingFrom)
             [dict setObject: [NSNumber numberWithFloat: peer->downloadFromRate] forKey: @"DL From Rate"];*/
         
-        [webSeeders addObject: dict];
+        [webSeeds addObject: dict];
     }
     
-    return webSeeders;
+    return webSeeds;
 }
 
 - (NSString *) progressString