fix a crash when sorting by tracker order; update NEWS

diff --git a/NEWS b/NEWS
index 2cab67c26266d26a562d25b607fb1043c0b0701e..f2bce257f5d59b25d8e9d4fe3e86798cc2719a8c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ NEWS file for Transmission <http://www.transmissionbt.com/>
    + Support https tracker connections
    + IP blocking using the Bluetack Level1 blocklist
    + Ability to reset global statistics
+   + Better support of multitracker torrents
    + Various bugfixes
 - Mac
    + Display of decimal numbers matches system international settings

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 3efc3d85ad69d7972771ceaa47e0aac57bdad7fa..8ea571e8becbc4f18a3bd947fa15006822c7c9a8 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -39,15 +39,14 @@
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "NSMenuAdditions.h"
-#import "UKKQueue.h"
 #import "ExpandedPathToPathTransformer.h"
 #import "ExpandedPathToIconTransformer.h"
 #import "SpeedLimitToTurtleIconTransformer.h"
 #include "utils.h" //tr_getRatio()
 
+#import "UKKQueue.h"
 #import <Sparkle/Sparkle.h>
 
-
 #define TOOLBAR_CREATE                  @"Toolbar Create"
 #define TOOLBAR_OPEN_FILE               @"Toolbar Open"
 #define TOOLBAR_OPEN_WEB                @"Toolbar Open Web"
@@ -1816,7 +1815,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     {
         NSSortDescriptor * nameDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"name" ascending: asc
                                                 selector: @selector(caseInsensitiveCompare:)] autorelease],
-                        * trackerDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"trackerAddress" ascending: asc
+                        * trackerDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"trackerAddressAnnounce" ascending: asc
                                                 selector: @selector(caseInsensitiveCompare:)] autorelease];
         
         descriptors = [[NSArray alloc] initWithObjects: trackerDescriptor, nameDescriptor, orderDescriptor, nil];
@@ -2006,7 +2005,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         int oldGroupValue = -2;
         for (i = 0; i < [allTorrents count]; i++)
         {
-            Torrent * torrent = [allTorrents objectAtIndex: i];
+            torrent = [allTorrents objectAtIndex: i];
             int groupValue = [torrent groupValue];
             if (groupValue != oldGroupValue)
             {
@@ -2258,11 +2257,11 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
 
 - (void) updateGroupsFilterButton
 {
-    int index = [fDefaults integerForKey: @"FilterGroup"];
+    int groupIndex = [fDefaults integerForKey: @"FilterGroup"];
     
     NSImage * icon = nil;
     NSString * toolTip;
-    switch (index)
+    switch (groupIndex)
     {
         case GROUP_FILTER_ALL_TAG:
             icon = [NSImage imageNamed: @"PinTemplate.png"];
@@ -2275,9 +2274,9 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
                         NSLocalizedString(@"No Label", "Groups -> Button")];
             break;
         default:
-            icon = [[GroupsController groups] imageForIndex: index isSmall: YES];
+            icon = [[GroupsController groups] imageForIndex: groupIndex isSmall: YES];
             toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"),
-                        [[GroupsController groups] nameForIndex: index]];
+                        [[GroupsController groups] nameForIndex: groupIndex]];
     }
     
     [[fGroupFilterMenu itemAtIndex: 0] setImage: icon];

diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index bc356f31355abe98791a63933c4b8e7ce9888652..c8f6a3744452966fb2b284277d780c5dd2bf67d4 100644 (file)
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
@@ -1,4 +1,3 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "Transmission";
 NSHumanReadableCopyright = "Copyright 2005-2008 The Transmission Project";

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 3f93428272ecad3aec14baa885c23a26a034da6b..cd03567f8ddc568dd295d3c4a78cd2883d976f0b 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -1122,6 +1122,7 @@ typedef enum
     }
 }
 
+#warning reload table when necessary?
 - (void) updateInfoTracker
 {
     if ([fTorrents count] != 1)