add support for auto-updating to beta releases

diff --git a/configure.ac b/configure.ac
index 370c30d7821a9f5e1da9a33d0d01ea28e1667c50..546add2e9e53a342d8679af36b526a851ae159af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl convention: -TR MAJOR MINOR MAINT STATUS - (each a single char)
-dnl STATUS: "X" for prerelease test builds,
+dnl STATUS: "X" for prerelease beta builds,
 dnl         "Z" for unsupported trunk builds,
 dnl         "0" for stable, supported releases
 dnl these should be the only two lines you need to change

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 23b22541320df542fa48799ba333604225f1f1ec..e8d20abc45f76d88d0e23b2f6f5b355599d304df 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -263,14 +263,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         SUUpdater * updater = [SUUpdater sharedUpdater];
         [updater setDelegate: self];
         fUpdateInProgress = NO;
-        
-        //reset old Sparkle settings from previous versions
-        [fDefaults removeObjectForKey: @"SUScheduledCheckInterval"];
-        if ([fDefaults objectForKey: @"CheckForUpdates"])
-        {
-            [updater setAutomaticallyChecksForUpdates: [fDefaults boolForKey: @"CheckForUpdates"]];
-            [fDefaults removeObjectForKey: @"CheckForUpdates"];
-        }
     }
     return self;
 }

diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist
index 62a8efee36a9f253ce2b5554ddf2370044e275e6..ae705c34730f9ae9b0b2ff2028221ffbb79fc5f7 100644 (file)
--- a/macosx/Defaults.plist
+++ b/macosx/Defaults.plist
@@ -8,6 +8,8 @@
        <false/>
        <key>AutoStartDownload</key>
        <true/>
+       <key>AutoUpdateBeta</key>
+       <false/>
        <key>BadgeDownloadRate</key>
        <true/>
        <key>BadgeUploadRate</key>

diff --git a/macosx/Info.plist b/macosx/Info.plist
index 1cf3e4ec461f5480dbe2c2466d47241345e8813d..dfd3ba2fb4bad3a24ae8b20bf0ed37b28f3e91e7 100644 (file)
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -79,8 +79,10 @@
        </array>
        <key>SUAllowsAutomaticUpdates</key>
        <false/>
-       <key>SUFeedURL</key>
+       <key>AppcastRelease</key>
        <string>http://www.transmissionbt.com/appcast.xml</string>
+       <key>AppcastBeta</key>
+       <string>http://www.transmissionbt.com/appcast_beta.xml</string>
        <key>SUPublicDSAKeyFile</key>
        <string>sparkle_dsa_pub.pem</string>
        <key>SUScheduledCheckInterval</key>

diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 825cfe928e6a4a2bd7be1f605c669e30e69e1b3c..ab33a08b030b5eba0de9bc8d2b933a1f7817381e 100644 (file)
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -65,6 +65,8 @@
 + (void) setHandle: (tr_session *) handle;
 + (tr_session *) handle;
 
+- (void) updateAppcastURL: (id) sender;
+
 - (void) setPort: (id) sender;
 - (void) randomPort: (id) sender;
 - (void) setNat: (id) sender;

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index b6c9c4c59909e3a20fdaf399268c9b09b83d1486..ab89d37a82ba20cdbabf6aeb7a7282754e349b84 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -31,6 +31,8 @@
 #import "UKKQueue.h"
 #import "utils.h"
 
+#import <Sparkle/Sparkle.h>
+
 #define DOWNLOAD_FOLDER     0
 #define DOWNLOAD_TORRENT    2
 
@@ -139,6 +141,16 @@ tr_session * fHandle;
         if (!fRPCWhitelistArray)
             fRPCWhitelistArray = [[NSMutableArray arrayWithObject: @"127.0.0.1"] retain];
         [self updateRPCWhitelist];
+        
+        //reset old Sparkle settings from previous versions
+        [fDefaults removeObjectForKey: @"SUScheduledCheckInterval"];
+        if ([fDefaults objectForKey: @"CheckForUpdates"])
+        {
+            [[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates: [fDefaults boolForKey: @"CheckForUpdates"]];
+            [fDefaults removeObjectForKey: @"CheckForUpdates"];
+        }
+        
+        [self updateAppcastURL: nil];
     }
     
     return self;
@@ -326,6 +338,17 @@ tr_session * fHandle;
                                         TOOLBAR_PEERS, TOOLBAR_NETWORK, TOOLBAR_REMOTE, nil];
 }
 
+//for a beta release, always use the beta appcast
+#if defined(BETA_RELEASE)
+#define APPCAST_URL @"AppcastBeta"
+#else
+#define APPCAST_URL ([[NSUserDefaults standardUserDefaults] boolForKey: @"AutoUpdateBeta"] ? @"AppcastBeta" : @"AppcastRelease")
+#endif
+- (void) updateAppcastURL: (id) sender
+{
+    [[SUUpdater sharedUpdater] setFeedURL: [NSURL URLWithString: [[[NSBundle mainBundle] infoDictionary] objectForKey: APPCAST_URL]]];
+}
+
 - (void) setPort: (id) sender
 {
     int port = [sender intValue];

diff --git a/macosx/appcast/appcast_beta.xml b/macosx/appcast/appcast_beta.xml
new file mode 100644 (file)
index 0000000..2aae217
--- /dev/null
+++ b/macosx/appcast/appcast_beta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+  <channel>
+    <title>Transmission Appcast</title>
+    <link>http://www.transmissionbt.com/appcast.xml</link>
+    <description>Most recent version available.</description>
+    <language>en</language>
+    <pubDate>Wed, 24 Dec 2008 12:30:00 -0400</pubDate>
+
+       <item>
+               <title>Transmission 1.42</title>
+               <sparkle:releaseNotesLink>http://www.transmissionbt.com/appcast/releasenotes.html</sparkle:releaseNotesLink>
+       <pubDate>Wed, 24 Dec 2008 12:30:00 -0400</pubDate>
+       <enclosure
+       url="http://mirrors.m0k.org/transmission/files/Transmission-1.42.dmg" 
+       sparkle:version="7494"
+       sparkle:shortVersionString="1.42"
+       sparkle:dsaSignature="MC0CFDGYBe/7/7bAtZXeOqYO26iKrNJMAhUAiHvc+yWm071G/wnKsbOXUlzAgoM="
+       length="3674660"
+       sparkle:minimumSystemVersion="10.4.11"
+       type="application/octet-stream"/>
+    </item>
+    
+  </channel>
+</rss>

diff --git a/macosx/appcast/releasenotes_beta.html b/macosx/appcast/releasenotes_beta.html
new file mode 100644 (file)
index 0000000..87b4587
--- /dev/null
+++ b/macosx/appcast/releasenotes_beta.html
@@ -0,0 +1,66 @@
+<html>
+
+       <head>
+               <meta http-equiv="content-type" content="text/html;charset=utf-8">
+               <title>What's new in Transmission?</title>
+               <meta name="robots" content="anchors">
+               <link href="releasenotes.css" type="text/css" rel="stylesheet" media="all">
+       </head>
+
+       <body>
+               <br />
+                       <table class="dots" width="100%" border="0" cellspacing="0" cellpadding="0" summary="Two column table with heading">
+                               <tr>
+                                       <td class="blue">
+                                               <h3>1.42 Core Changes</h3>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <ul>
+                                               <li>Fix 1.41 lockup issue</li>
+                                               </ul>
+                                       </td>
+                               </tr>
+                       </table>
+                       <br>
+                       <table class="dots" width="100%" border="0" cellspacing="0" cellpadding="0" summary="Two column table with heading">
+                               <tr>
+                                       <td class="blue">
+                                               <h3>1.41 Core Changes</h3>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <ul>
+                                               <li>Better peer management in large swarms</li>
+                                               <li>Support BitTorrent Enhancement Proposal (BEP) #21 "Extension for Partial Seeds"</li>
+                                               <li>Partial support for BEP #6 "Fast Extension" (reject, have all/none)</li>
+                                               <li>Honor the peer's BEP #10 reqq key, when available</li>
+                                               <li>Fix 1.40 "Got HTTP Status Code: 0" error message</li>
+                                               <li>Fix 1.40 "lazy bitfield" error</li>
+                                               <li>Fix 1.40 "jumpy upload speed" bug</li>
+                                               <li>Fix handshake peer_id error</li>
+                                               <li>Corrrectly handle Windows-style newlines in Bluetack blocklists</li>
+                                               <li>More accurate bandwidth measurement</li>
+                                               <li>File selection & priority was reset when editing a torrent's tracker list</li>
+                                               </ul>
+                                       </td>
+                               </tr>
+                       </table>
+                       <p>For a full list of changes, <a href="http://trac.transmissionbt.com/query?milestone=1.41&group=component&groupdesc=1&order=severity">click here</a>.</p>
+                       <table class="dots" width="100%" border="0" cellspacing="0" cellpadding="0" summary="Two column table with heading">
+                               <tr>
+                                       <td class="red">
+                                               <h3>Note</h3>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <p>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.</p>
+                                       </td>
+                               </tr>
+                       </table>
+       </body>
+
+</html>

diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib
index d537ba8a4d087059b19c6837c426b19f9d1a31e8..57a5b4c443c783c36af6bfb10e0642bbf3b331de 100644 (file)
--- a/macosx/en.lproj/PrefsWindow.xib
+++ b/macosx/en.lproj/PrefsWindow.xib
@@ -8,9 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="1760"/>
-                       <integer value="66"/>
-                       <integer value="153"/>
+                       <integer value="28"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -56,14 +54,14 @@
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
                        </object>
                        <object class="NSCustomView" id="249126185">
-                               <nil key="NSNextResponder"/>
+                               <reference key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <object class="NSButton" id="588239529">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{189, 101}, {181, 18}}</string>
+                                               <string key="NSFrame">{{189, 120}, {181, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="114288993">
@@ -94,7 +92,7 @@
                                        <object class="NSButton" id="276216218">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{189, 141}, {193, 18}}</string>
+                                               <string key="NSFrame">{{189, 160}, {193, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="1341189">
@@ -116,7 +114,7 @@
                                        <object class="NSTextField" id="196954257">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{78, 142}, {108, 17}}</string>
+                                               <string key="NSFrame">{{78, 161}, {108, 17}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="184036008">
@@ -148,7 +146,7 @@
                                        <object class="NSTextField" id="71273405">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{42, 198}, {144, 17}}</string>
+                                               <string key="NSFrame">{{42, 217}, {144, 17}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="811813130">
@@ -164,7 +162,7 @@
                                        <object class="NSButton" id="843992339">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{189, 197}, {149, 18}}</string>
+                                               <string key="NSFrame">{{189, 216}, {149, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="284839720">
@@ -186,7 +184,7 @@
                                        <object class="NSButton" id="390486891">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{189, 177}, {131, 18}}</string>
+                                               <string key="NSFrame">{{189, 196}, {131, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="556408151">
@@ -208,7 +206,7 @@
                                        <object class="NSButton" id="351716965">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{208, 121}, {258, 18}}</string>
+                                               <string key="NSFrame">{{208, 140}, {258, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="263018774">
@@ -230,7 +228,7 @@
                                        <object class="NSButton" id="1004103148">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{208, 81}, {258, 18}}</string>
+                                               <string key="NSFrame">{{208, 100}, {258, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="718603970">
@@ -252,7 +250,7 @@
                                        <object class="NSTextField" id="343626323">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{106, 235}, {80, 17}}</string>
+                                               <string key="NSFrame">{{106, 254}, {80, 17}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="1017981285">
@@ -268,7 +266,7 @@
                                        <object class="NSButton" id="1205696">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{189, 234}, {303, 18}}</string>
+                                               <string key="NSFrame">{{189, 253}, {303, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="37001111">
@@ -290,7 +288,7 @@
                                        <object class="NSButton" id="574904146">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{288, 49}, {82, 32}}</string>
+                                               <string key="NSFrame">{{288, 68}, {82, 32}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="983781505">
@@ -313,7 +311,7 @@
                                        <object class="NSTextField" id="692603192">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{188, 59}, {101, 17}}</string>
+                                               <string key="NSFrame">{{188, 78}, {101, 17}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="765517424">
@@ -329,7 +327,7 @@
                                        <object class="NSButton" id="688052354">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{189, 19}, {183, 18}}</string>
+                                               <string key="NSFrame">{{189, 38}, {183, 18}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="687318378">
@@ -348,10 +346,32 @@
                                                        <int key="NSPeriodicInterval">25</int>
                                                </object>
                                        </object>
+                                       <object class="NSButton" id="1005555131">
+                                               <reference key="NSNextResponder" ref="249126185"/>
+                                               <int key="NSvFlags">256</int>
+                                               <string key="NSFrame">{{208, 18}, {155, 18}}</string>
+                                               <reference key="NSSuperview" ref="249126185"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSButtonCell" key="NSCell" id="794987986">
+                                                       <int key="NSCellFlags">67239424</int>
+                                                       <int key="NSCellFlags2">0</int>
+                                                       <string key="NSContents">Include beta releases</string>
+                                                       <reference key="NSSupport" ref="86725571"/>
+                                                       <reference key="NSControlView" ref="1005555131"/>
+                                                       <int key="NSButtonFlags">1211912703</int>
+                                                       <int key="NSButtonFlags2">2</int>
+                                                       <reference key="NSNormalImage" ref="1001726176"/>
+                                                       <reference key="NSAlternateImage" ref="764913887"/>
+                                                       <string key="NSAlternateContents"/>
+                                                       <string key="NSKeyEquivalent"/>
+                                                       <int key="NSPeriodicDelay">200</int>
+                                                       <int key="NSPeriodicInterval">25</int>
+                                               </object>
+                                       </object>
                                        <object class="NSTextField" id="964665196">
                                                <reference key="NSNextResponder" ref="249126185"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{69, 20}, {117, 17}}</string>
+                                               <string key="NSFrame">{{69, 39}, {117, 17}}</string>
                                                <reference key="NSSuperview" ref="249126185"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="450175985">
@@ -365,7 +385,8 @@
                                                </object>
                                        </object>
                                </object>
-                               <string key="NSFrameSize">{535, 272}</string>
+                               <string key="NSFrameSize">{535, 291}</string>
+                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
@@ -1528,7 +1549,7 @@
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="284666863">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3048,7 +3069,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
                                                                </object>
                                                                <string key="NSFrame">{{1, 1}, {141, 169}}</string>
                                                                <reference key="NSSuperview" ref="544077474"/>
-                                                               <reference key="NSNextKeyView" ref="638525082"/>
                                                                <reference key="NSDocView" ref="638525082"/>
                                                                <reference key="NSBGColor" ref="729660797"/>
                                                                <int key="NScvFlags">4</int>
@@ -3076,7 +3096,6 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
                                                </object>
                                                <string key="NSFrame">{{20, 49}, {143, 171}}</string>
                                                <reference key="NSSuperview" ref="284666863"/>
-                                               <reference key="NSNextKeyView" ref="568562479"/>
                                                <int key="NSsFlags">530</int>
                                                <reference key="NSVScroller" ref="287972127"/>
                                                <reference key="NSHScroller" ref="781866080"/>
@@ -3343,11 +3362,10 @@ zcfN584IzijOSc5pzorOqs66ztvO+88czzzPXc99z57Pvs/fz+/QANAg0EHQYdCC0KLQw9Dj0PPRFNE0
                                        </object>
                                </object>
                                <string key="NSFrameSize">{535, 240}</string>
-                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                        </object>
                        <object class="NSCustomView" id="352903881">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3937,7 +3955,6 @@ AAABAAAAAQ</bytes>
                                        </object>
                                </object>
                                <string key="NSFrameSize">{535, 226}</string>
-                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
@@ -4400,7 +4417,7 @@ AAABAAAAAQ</bytes>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="204700639">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5031,7 +5048,6 @@ AAABAAAAAQ</bytes>
                                        </object>
                                </object>
                                <string key="NSFrameSize">{535, 345}</string>
-                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
@@ -5518,6 +5534,11 @@ AAABAAAAAQ</bytes>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSUserDefaultsController" id="356871564">
+                               <object class="NSMutableArray" key="NSDeclaredKeys">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <string>AutoUpdateBeta</string>
+                                       <string>SUEnableAutomaticChecks</string>
+                               </object>
                                <bool key="NSSharedInstance">YES</bool>
                        </object>
                        <object class="NSCustomObject" id="981493640">
@@ -8694,6 +8715,46 @@ AAABAAAAAQ</bytes>
                                        </object>
                                        <int key="connectionID">1894</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBBindingConnection" key="connection">
+                                               <string key="label">value: values.AutoUpdateBeta</string>
+                                               <reference key="source" ref="1005555131"/>
+                                               <reference key="destination" ref="356871564"/>
+                                               <object class="NSNibBindingConnector" key="connector">
+                                                       <reference key="NSSource" ref="1005555131"/>
+                                                       <reference key="NSDestination" ref="356871564"/>
+                                                       <string key="NSLabel">value: values.AutoUpdateBeta</string>
+                                                       <string key="NSBinding">value</string>
+                                                       <string key="NSKeyPath">values.AutoUpdateBeta</string>
+                                                       <int key="NSNibBindingConnectorVersion">2</int>
+                                               </object>
+                                       </object>
+                                       <int key="connectionID">1897</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBBindingConnection" key="connection">
+                                               <string key="label">enabled: values.SUEnableAutomaticChecks</string>
+                                               <reference key="source" ref="1005555131"/>
+                                               <reference key="destination" ref="356871564"/>
+                                               <object class="NSNibBindingConnector" key="connector">
+                                                       <reference key="NSSource" ref="1005555131"/>
+                                                       <reference key="NSDestination" ref="356871564"/>
+                                                       <string key="NSLabel">enabled: values.SUEnableAutomaticChecks</string>
+                                                       <string key="NSBinding">enabled</string>
+                                                       <string key="NSKeyPath">values.SUEnableAutomaticChecks</string>
+                                                       <int key="NSNibBindingConnectorVersion">2</int>
+                                               </object>
+                                       </object>
+                                       <int key="connectionID">1898</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">updateAppcastURL:</string>
+                                               <reference key="source" ref="511492310"/>
+                                               <reference key="destination" ref="1005555131"/>
+                                       </object>
+                                       <int key="connectionID">1899</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -8758,6 +8819,7 @@ AAABAAAAAQ</bytes>
                                                        <reference ref="692603192"/>
                                                        <reference ref="688052354"/>
                                                        <reference ref="964665196"/>
+                                                       <reference ref="1005555131"/>
                                                </object>
                                                <reference key="parent" ref="37013934"/>
                                                <string key="objectName">General</string>
@@ -11321,6 +11383,20 @@ AAABAAAAAQ</bytes>
                                                <reference key="object" ref="660134747"/>
                                                <reference key="parent" ref="360885126"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1895</int>
+                                               <reference key="object" ref="1005555131"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="794987986"/>
+                                               </object>
+                                               <reference key="parent" ref="249126185"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1896</int>
+                                               <reference key="object" ref="794987986"/>
+                                               <reference key="parent" ref="1005555131"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -11683,6 +11759,9 @@ AAABAAAAAQ</bytes>
                                        <string>1891.IBPluginDependency</string>
                                        <string>1891.ImportedFromIB2</string>
                                        <string>1892.IBPluginDependency</string>
+                                       <string>1895.IBPluginDependency</string>
+                                       <string>1895.ImportedFromIB2</string>
+                                       <string>1896.IBPluginDependency</string>
                                        <string>190.IBPluginDependency</string>
                                        <string>190.ImportedFromIB2</string>
                                        <string>192.IBPluginDependency</string>
@@ -12242,6 +12321,9 @@ AAABAAAAAQ</bytes>
                                        <real value="1.000000e+00"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="761722050"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="761722050"/>
@@ -12317,7 +12399,7 @@ AAABAAAAAQ</bytes>
                                        <reference ref="761722050"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="761722050"/>
-                                       <string>{{24, 399}, {535, 272}}</string>
+                                       <string>{{242, 542}, {535, 291}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="761722050"/>
                                        <string>{{0, 701}, {539, 272}}</string>
@@ -12469,7 +12551,7 @@ AAABAAAAAQ</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">1894</int>
+                       <int key="maxID">1899</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -12656,6 +12738,7 @@ AAABAAAAAQ</bytes>
                                                        <string>setSpeedLimit:</string>
                                                        <string>setStalled:</string>
                                                        <string>setStalledMinutes:</string>
+                                                       <string>updateAppcastURL:</string>
                                                        <string>updateBlocklist:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
@@ -12708,6 +12791,7 @@ AAABAAAAAQ</bytes>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">

diff --git a/macosx/version.sh b/macosx/version.sh
index 6d988867e2ccce6b4fdb241316ed6c304a22ef85..8ae6597474d3777066cf1c72fa26c3bf990f8a85 100755 (executable)
--- a/macosx/version.sh
+++ b/macosx/version.sh
@@ -3,7 +3,7 @@
 # $Id$
 
 # convention: -TR MAJOR MINOR MAINT STATUS - (each a single char)
-# STATUS: "X" for prerelease test builds,
+# STATUS: "X" for prerelease beta builds,
 #         "Z" for unsupported trunk builds,
 #         "0" for stable, supported releases
 # these should be the only two lines you need to change
@@ -37,6 +37,14 @@ cat > libtransmission/version.h.new << EOF
 #define VERSION_STRING_INFOPLIST  $USERAGENT_PREFIX
 #define BUNDLE_VERSION_INFOPLIST  $SVN_REVISION
 EOF
+
+# Check if it's a beta release
+if [ ${PEERID_PREFIX:6:1} = X ]; then
+cat >> libtransmission/version.h.new << EOF
+#define BETA_RELEASE              "BETA"
+EOF
+fi
+
 replace_if_differs libtransmission/version.h.new libtransmission/version.h
 
 exit 0