From 31ddd1150869ede4196c340fcde31580ef5d8d25 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 6 May 2008 01:53:15 +0000 Subject: [PATCH] fix a crash when sorting by tracker order; update NEWS --- NEWS | 1 + macosx/Controller.m | 15 +++++++-------- macosx/English.lproj/InfoPlist.strings | 1 - macosx/InfoWindowController.m | 1 + 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 2cab67c26..f2bce257f 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ NEWS file for Transmission + 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 3efc3d85a..8ea571e8b 100644 --- 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 - #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 bc356f313..c8f6a3744 100644 --- 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 3f9342827..cd03567f8 100644 --- 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)