From 4c6f21da1e9b144a3e6aea6501ab4be4216e9f58 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 13 Jan 2009 04:51:11 +0000 Subject: [PATCH] make beta support use upcoming Sparkle "tag" functionality - beta autoupdate is disabled for now --- macosx/Info.plist | 4 +- macosx/PrefsController.h | 2 +- macosx/PrefsController.m | 11 +++-- macosx/appcast/appcast_beta.xml | 25 ---------- macosx/appcast/releasenotes_beta.html | 66 --------------------------- macosx/en.lproj/PrefsWindow.xib | 31 +++---------- 6 files changed, 14 insertions(+), 125 deletions(-) delete mode 100644 macosx/appcast/appcast_beta.xml delete mode 100644 macosx/appcast/releasenotes_beta.html diff --git a/macosx/Info.plist b/macosx/Info.plist index d31eeea61..f4795d21c 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -71,10 +71,8 @@ SUAllowsAutomaticUpdates - AppcastRelease + SUFeedURL http://www.transmissionbt.com/appcast.xml - AppcastBeta - http://www.transmissionbt.com/appcast_beta.xml SUPublicDSAKeyFile sparkle_dsa_pub.pem SUScheduledCheckInterval diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index ab33a08b0..1651e0e64 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -65,7 +65,7 @@ + (void) setHandle: (tr_session *) handle; + (tr_session *) handle; -- (void) updateAppcastURL: (id) sender; +- (void) setAutoUpdateToBeta: (id) sender; - (void) setPort: (id) sender; - (void) randomPort: (id) sender; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index ab89d37a8..39903054c 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -150,7 +150,7 @@ tr_session * fHandle; [fDefaults removeObjectForKey: @"CheckForUpdates"]; } - [self updateAppcastURL: nil]; + [self setAutoUpdateToBeta: nil]; } return self; @@ -338,15 +338,16 @@ tr_session * fHandle; TOOLBAR_PEERS, TOOLBAR_NETWORK, TOOLBAR_REMOTE, nil]; } +#warning add custom Sparkle to support this; reenable in XIB //for a beta release, always use the beta appcast #if defined(BETA_RELEASE) -#define APPCAST_URL @"AppcastBeta" +#define SPARKLE_TAG YES #else -#define APPCAST_URL ([[NSUserDefaults standardUserDefaults] boolForKey: @"AutoUpdateBeta"] ? @"AppcastBeta" : @"AppcastRelease") +#define SPARKLE_TAG [fDefaults boolForKey: @"AutoUpdateBeta"] #endif -- (void) updateAppcastURL: (id) sender +- (void) setAutoUpdateToBeta: (id) sender { - [[SUUpdater sharedUpdater] setFeedURL: [NSURL URLWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey: APPCAST_URL]]]; + [[SUUpdater sharedUpdater] setAllowedTags: SPARKLE_TAG ? [NSSet setWithObject: @"beta"] : nil]; } - (void) setPort: (id) sender diff --git a/macosx/appcast/appcast_beta.xml b/macosx/appcast/appcast_beta.xml deleted file mode 100644 index 8bc04aea3..000000000 --- a/macosx/appcast/appcast_beta.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Transmission Appcast - http://www.transmissionbt.com/appcast.xml - Most recent version available. - en - Wed, 24 Dec 2008 12:30:00 -0400 - - - Transmission 1.42 - http://www.transmissionbt.com/appcast/releasenotes.html - Wed, 24 Dec 2008 12:30:00 -0400 - - 10.4.11" - - - - diff --git a/macosx/appcast/releasenotes_beta.html b/macosx/appcast/releasenotes_beta.html deleted file mode 100644 index 87b4587a8..000000000 --- a/macosx/appcast/releasenotes_beta.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - What's new in Transmission? - - - - - -
- - - - - - - -
-

1.42 Core Changes

-
-
    -
  • Fix 1.41 lockup issue
    • -
-
-
- - - - - - - -
-

1.41 Core Changes

-
-
    -
  • Better peer management in large swarms
    • -
  • Support BitTorrent Enhancement Proposal (BEP) #21 "Extension for Partial Seeds"
    • -
  • Partial support for BEP #6 "Fast Extension" (reject, have all/none)
    • -
  • Honor the peer's BEP #10 reqq key, when available
    • -
  • Fix 1.40 "Got HTTP Status Code: 0" error message
    • -
  • Fix 1.40 "lazy bitfield" error
    • -
  • Fix 1.40 "jumpy upload speed" bug
    • -
  • Fix handshake peer_id error
    • -
  • Corrrectly handle Windows-style newlines in Bluetack blocklists
    • -
  • More accurate bandwidth measurement
    • -
  • File selection & priority was reset when editing a torrent's tracker list
    • -
-
-

For a full list of changes, click here.

- - - - - - - -
-

Note

-
-

Transmission requires at least Mac OS X 10.4.11 with Security Update 2008-002. Mac OS X 10.5 or greater is highly recommended.

-
- - - diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib index 57a5b4c44..a0e8cec48 100644 --- a/macosx/en.lproj/PrefsWindow.xib +++ b/macosx/en.lproj/PrefsWindow.xib @@ -3069,6 +3069,7 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0 {{1, 1}, {141, 169}} + 4 @@ -3096,6 +3097,7 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0 {{20, 49}, {143, 171}} + 530 @@ -5534,11 +5536,6 @@ AAABAAAAAQ NSResponder - - YES - AutoUpdateBeta - SUEnableAutomaticChecks - YES @@ -8731,29 +8728,13 @@ AAABAAAAAQ 1897 - - - enabled: values.SUEnableAutomaticChecks - - - - - - enabled: values.SUEnableAutomaticChecks - enabled - values.SUEnableAutomaticChecks - 2 - - - 1898 - - updateAppcastURL: + setAutoUpdateToBeta: - 1899 + 1900 @@ -12551,7 +12532,7 @@ AAABAAAAAQ - 1899 + 1900 @@ -12706,6 +12687,7 @@ AAABAAAAAQ setAutoImport: setAutoSize: setAutoSpeedLimit: + setAutoUpdateToBeta: setBadge: setBlocklistAutoUpdate: setBlocklistEnabled: @@ -12738,7 +12720,6 @@ AAABAAAAAQ setSpeedLimit: setStalled: setStalledMinutes: - updateAppcastURL: updateBlocklist: