get compiling again

This commit is contained in:
Mitchell Livingston 2007-11-28 03:34:44 +00:00
parent 1e4b3a0577
commit d56c35b9cd
3 changed files with 167 additions and 165 deletions

4
NEWS
View File

@ -6,14 +6,14 @@ NEWS file for Transmission <http://transmission.m0k.org/>
+ Option to prefer not using encryption
+ Restore `scrape' feature in the command-line interface client
+ Fix memory corruption error on startup
+ Fix speed 0.90 speed limit bugs
+ Fix 0.90 speed limit bugs
- OS X:
+ Statistics window
+ Leopard: Time Machine will ignore incomplete downloads
+ Pieces Bar (return of Advanced Bar)
+ Availability Bar (overlay on regular bar)
+ Display remaining time for seeding transfers
+ Option to sort by total activity
+ Sort by total activity
0.94 (2007/11/25)
- All Platforms:

View File

@ -26,7 +26,7 @@
<string key="NSClassName" id="63895196">NSApplication</string>
</object>
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{248, 575}, {269, 182}}</string>
<int key="NSWTFlags">536870912</int>
@ -59,7 +59,7 @@
<reference key="NSControlView" ref="848189093"/>
<object class="NSColor" key="NSBackgroundColor" id="1062686007">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName" id="792823476">System</string>
<string key="NSCatalogName" id="3942744">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
@ -68,7 +68,7 @@
</object>
<object class="NSColor" key="NSTextColor" id="561189490">
<int key="NSColorSpace">6</int>
<reference key="NSCatalogName" ref="792823476"/>
<reference key="NSCatalogName" ref="3942744"/>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
@ -712,10 +712,10 @@
<reference ref="621197936"/>
<reference ref="621197936"/>
<reference ref="621197936"/>
<string>{{141, 739}, {269, 182}}</string>
<string>{{104, 750}, {269, 182}}</string>
<integer value="1" id="9"/>
<string>{196, 240}</string>
<string>{{141, 739}, {269, 182}}</string>
<string>{{104, 750}, {269, 182}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string id="142067237">{269, 182}</string>
@ -776,6 +776,58 @@
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<reference key="className" ref="63895196"/>
<nil key="superclassName"/>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey" id="679799153">IBProjectSource</string>
<string key="minorKey">macosx/NSApplicationAdditions.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<nil key="superclassName"/>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="679799153"/>
<string key="minorKey">macosx/NSMenuAdditions.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">StatsWindowController</string>
<string key="superclassName">NSWindowController</string>
@ -816,36 +868,10 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey" id="490016279">IBProjectSource</string>
<reference key="majorKey" ref="679799153"/>
<string key="minorKey">macosx/StatsWindowController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<nil key="superclassName"/>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="490016279"/>
<string key="minorKey">macosx/NSMenuAdditions.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className" id="963274514">NSObject</string>
<nil key="superclassName"/>
@ -868,7 +894,7 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="490016279"/>
<reference key="majorKey" ref="679799153"/>
<string key="minorKey">macosx/UKKQueue/UKKQueue.h</string>
</object>
</object>
@ -894,33 +920,7 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="490016279"/>
<string key="minorKey">macosx/UKKQueue/UKMainThreadProxy.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<reference key="className" ref="963274514"/>
<nil key="superclassName"/>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="490016279"/>
<reference key="majorKey" ref="679799153"/>
<string key="minorKey">macosx/IPCController.h</string>
</object>
</object>
@ -946,12 +946,12 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="490016279"/>
<reference key="majorKey" ref="679799153"/>
<string key="minorKey">macosx/UKKQueue/UKFileWatcher.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<reference key="className" ref="63895196"/>
<reference key="className" ref="963274514"/>
<nil key="superclassName"/>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -972,8 +972,8 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<reference key="majorKey" ref="490016279"/>
<string key="minorKey">macosx/NSApplicationAdditions.h</string>
<reference key="majorKey" ref="679799153"/>
<string key="minorKey">macosx/UKKQueue/UKMainThreadProxy.h</string>
</object>
</object>
</object>
@ -988,9 +988,9 @@ QgBgAGEAYgBjAGMAZAALAHIAgwCPAJAAoAChAKkAqgCtALcAuAC5AL4AwADFAMYAyQDNANMA2wDcAOMA
5ADsAO0A9AD1AP0A/gEFAQYBDwEQARcBGAEgASEBKAEwATEBOAFAAUEBSAFQAVEBWAFZAWEBYgFpAXEB
cgF5AYEBggGJAZEBkgGZAaEBogGqAGMACwGuAbABsQGxAbIBswG2AboByAHQAdEB1QHaAdsB4AHhAeYB
5wHsAe0B8gHzAfgB+QH+Af8CBAIFAgoCCwIQAhECMwI2AjcCOQJbAn4CoQKiAqMCpAKlAqYCpwKoAqkC
qgKrAqwCrQKuAq8CsAKxArICswK0ArUCtgK3ArgCuQK6ArsCvAK9Ar4CvwLAAsECxALHAvUDIwC8AyQD
JQMmAycDKAMpAyoDKwMsAy0DLgMvAzADMQMyAzMAXAM0AzUDNgM3AzgDOQCoAzoDOwM8Az0DPgC0Az8D
QANBAF0DQgNDA0QDRQNGA0cDSANJA0wDTwNSVSRudWxs3xASAA0ADgAPABAAEQASABMAFAAVABYAFwAY
qgKrAqwCrQKuAq8CsAKxArICswK0ArUCtgK3ArgCuQK6ArsCvAK9Ar4CvwLAAsECxALHAvUDIwMkAyUD
JgMnAygAvAMpAyoDKwMsAy0DLgMvAzADMQMyAzMDNAM1AzYDNwM4AzkDOgM7AzwDPQM+Az8DQANBA0ID
QwNEA0UAXAC0A0YAqANHA0gDSQNKA00DUANTVSRudWxs3xASAA0ADgAPABAAEQASABMAFAAVABYAFwAY
ABkAGgAbABwAHQAeAB8AIAAhACIAIwAkACUAJgAnACgAKQAqACsALAAtAC4ALwAwVk5TUm9vdFYkY2xh
c3NdTlNPYmplY3RzS2V5c18QD05TQ2xhc3Nlc1ZhbHVlc18QGU5TQWNjZXNzaWJpbGl0eU9pZHNWYWx1
ZXNdTlNDb25uZWN0aW9uc1tOU05hbWVzS2V5c1tOU0ZyYW1ld29ya11OU0NsYXNzZXNLZXlzWk5TT2lk
@ -1004,7 +1004,7 @@ TABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0AXgArXE5TV2luZG93Vmlld18QFk5TV2lu
ZG93Q29udGVudE1heFNpemVcTlNTY3JlZW5SZWN0XxATTlNGcmFtZUF1dG9zYXZlTmFtZV1OU1dpbmRv
d1RpdGxlWU5TV1RGbGFnc11OU1dpbmRvd0NsYXNzXxAWTlNXaW5kb3dDb250ZW50TWluU2l6ZVxOU1dp
bmRvd1JlY3RZTlNNYXhTaXplXxAPTlNXaW5kb3dCYWNraW5nXxARTlNXaW5kb3dTdHlsZU1hc2tZTlNN
aW5TaXplW05TVmlld0NsYXNzgA2AVYALgFGAVIAJEiAAAACACoAMgAiAUxACEA+AUoAAXxAYe3syNDgs
aW5TaXplW05TVmlld0NsYXNzgA2AVYALgFGAVIAJEiAAAACACoAMgAiAUxACEAeAUoAAXxAYe3syNDgs
IDU3NX0sIHsyNjksIDE4Mn19WlN0YXRpc3RpY3NXTlNQYW5lbFp7MjY5LCAxODJ91wBlAA4AZgBnAGgA
aQBqAGsAbABtAG4AbwBrAHFfEA9OU05leHRSZXNwb25kZXJaTlNTdWJ2aWV3c1hOU3ZGbGFnc1tOU0Zy
YW1lU2l6ZVhOU1dpbmRvd1tOU1N1cGVydmlld4AOgFCADxEBAIBOgA6AT9IADgA+AHMAdIBNrgB1AHYA
@ -1050,77 +1050,77 @@ gBSAShIQQAgAgBzSADcAOAGrAayjAawBrQA7Xk5TTXV0YWJsZUFycmF5V05TQXJyYXnSADcAOAGvANGj
ANEA0gA7XxAWe3swLCAwfSwgezE2ODAsIDEwMjh9fVp7MjY5LCAyMDR9W1N0YXRzV2luZG930gA3ADgB
tAG1ogG1ADtfEBBOU1dpbmRvd1RlbXBsYXRl0gA3ADgBtwG4owG4AbkAO1xOU011dGFibGVTZXRVTlNT
ZXTSAA4APgBzAbyATasBvQG+Ab8BwAHBAcIBwwHEAcUBxgHHgFiAW4BdgF+AYYBjgGWAZ4BpgGuAbdQA
DgHJAcoBywHMAEEAHwHPXU5TRGVzdGluYXRpb25YTlNTb3VyY2VXTlNMYWJlbIBagAeAAoBZVndpbmRv
d9IANwA4AdIB06MB0wHUADtfEBROU05pYk91dGxldENvbm5lY3Rvcl5OU05pYkNvbm5lY3RvctQADgHJ
AcoBywHMAB8AQQHZgFqAAoAHgFxYZGVsZWdhdGXUAA4ByQHKAcsBzAB/AB8B34BagEGAAoBeXxARZlVw
bG9hZGVkQWxsRmllbGTUAA4ByQHKAcsBzAB8AB8B5YBagDeAAoBgWmZUaW1lRmllbGTUAA4ByQHKAcsB
zAB6AB8B64BagDGAAoBiXxAQZkRvd25sb2FkZWRGaWVsZNQADgHJAcoBywHMAHsAHwHxgFqANIACgGRb
ZlJhdGlvRmllbGTUAA4ByQHKAcsBzAB+AB8B94BagD6AAoBmXxAPZk51bU9wZW5lZEZpZWxk1AAOAckB
ygHLAcwAggAfAf2AWoBKgAKAaF1mVGltZUFsbEZpZWxk1AAOAckBygHLAcwAgQAfAgOAWoBHgAKAal5m
UmF0aW9BbGxGaWVsZNQADgHJAcoBywHMAHkAHwIJgFqALYACgGxeZlVwbG9hZGVkRmllbGTUAA4ByQHK
AcsBzACAAB8CD4BagESAAoBuXxATZkRvd25sb2FkZWRBbGxGaWVsZNIADgA+AhICE4ByrxAfAHUBTAB4
AHYBfQGdAEEBHAB7AIAAgQD5AFEBjQCKAHcAfwE8AQoBXQB9AHwA1wEsAHoAeQIuAH4A6AFtAIKAEIA8
gCmAIYBGgEyAB4AzgDSARIBHgCuADYBJgBKAJYBBgDmAL4BAgDqAN4AjgDaAMYAtgHCAPoAngEOAStIA
DgAyADMCNYAEgHFdTlNBcHBsaWNhdGlvbtIANwA4AjgBraIBrQA70gAOAD4CEgI7gHKvEB8AUQB9AFEA
UQCAAIIAHwB6AFEAUQBRAHgAQQCBAHUAUQBRAHwAeQB+AFEAUQB2AHsAUQBRAB8AUQB3AH8AUYANgDqA
DYANgESASoACgDGADYANgA2AKYAHgEeAEIANgA2AN4AtgD6ADYANgCGANIANgA2AAoANgCWAQYAN0gAO
AD4CEgJdgHKvECAAdQFMAHgAdgF9AZ0AQQEcAHsAgACBAPkAHwGNAFEAdwB/AIoBPAEKAV0AfQB8ANcB
LAB6AHkCLgB+AOgBbQCCgBCAPIApgCGARoBMgAeAM4A0gESAR4ArgAKASYANgCWAQYASgDmAL4BAgDqA
N4AjgDaAMYAtgHCAPoAngEOAStIADgA+AhICgIByrxAgAoECggKDAoQChQKGAocCiAKJAooCiwKMAo0C
DgHJAcoBywHMAH8AHwHPXU5TRGVzdGluYXRpb25YTlNTb3VyY2VXTlNMYWJlbIBagEGAAoBZXxARZlVw
bG9hZGVkQWxsRmllbGTSADcAOAHSAdOjAdMB1AA7XxAUTlNOaWJPdXRsZXRDb25uZWN0b3JeTlNOaWJD
b25uZWN0b3LUAA4ByQHKAcsBzAB5AB8B2YBagC2AAoBcXmZVcGxvYWRlZEZpZWxk1AAOAckBygHLAcwA
ggAfAd+AWoBKgAKAXl1mVGltZUFsbEZpZWxk1AAOAckBygHLAcwAgAAfAeWAWoBEgAKAYF8QE2ZEb3du
bG9hZGVkQWxsRmllbGTUAA4ByQHKAcsBzAB6AB8B64BagDGAAoBiXxAQZkRvd25sb2FkZWRGaWVsZNQA
DgHJAcoBywHMAHwAHwHxgFqAN4ACgGRaZlRpbWVGaWVsZNQADgHJAcoBywHMAHsAHwH3gFqANIACgGZb
ZlJhdGlvRmllbGTUAA4ByQHKAcsBzABBAB8B/YBagAeAAoBoVndpbmRvd9QADgHJAcoBywHMAIEAHwID
gFqAR4ACgGpeZlJhdGlvQWxsRmllbGTUAA4ByQHKAcsBzAAfAEECCYBagAKAB4BsWGRlbGVnYXRl1AAO
AckBygHLAcwAfgAfAg+AWoA+gAKAbl8QD2ZOdW1PcGVuZWRGaWVsZNIADgA+AhICE4ByrxAfAUwBHAB1
AH4CGADoAX0BPAGdAIoBbQB9AIEA+QCCAHoAewB3AEEAgAB8ASwAdgB4AH8AUQDXAHkBCgFdAY2APIAz
gBCAPoBwgCeARoA5gEyAEoBDgDqAR4ArgEqAMYA0gCWAB4BEgDeANoAhgCmAQYANgCOALYAvgECASdIA
DgAyADMCNYAEgHFdTlNBcHBsaWNhdGlvbtIANwA4AjgBraIBrQA70gAOAD4CEgI7gHKvEB8AfQB6AFEA
UQAfAHcAgAB8AIIAdQB/AFEAUQB4AFEAUQBRAFEAHwBRAFEAewBRAFEAUQBBAHYAUQB5AH4AgYA6gDGA
DYANgAKAJYBEgDeASoAQgEGADYANgCmADYANgA2ADYACgA2ADYA0gA2ADYANgAeAIYANgC2APoBH0gAO
AD4CEgJdgHKvECABTAEcAB8AdQB+AhgBnQDoAX0BPACKAW0AgQB9APkAggB6AHsAdwBBAIAAfAGNAHYA
eAB/AFEBXQB5ASwA1wEKgDyAM4ACgBCAPoBwgEyAJ4BGgDmAEoBDgEeAOoArgEqAMYA0gCWAB4BEgDeA
SYAhgCmAQYANgECALYA2gCOAL9IADgA+AhICgIByrxAgAoECggKDAoQChQKGAocCiAKJAooCiwKMAo0C
jgKPApACkQKSApMClAKVApYClwKYApkCmgKbApwCnQKeAp8CoIB2gHeAeIB5gHqAe4B8gH2AfoB/gICA
gYCCgIOAhICFgIaAh4CIgImAioCLgIyAjYCOgI+AkICRgJKAk4CUgJVfEBdTdGF0aWMgVGV4dCAoVXBs
b2FkZWQ6KV8QIlRleHQgRmllbGQgQ2VsbCAoUHJvZ3JhbSBTdGFydGVkOilfEBtTdGF0aWMgVGV4dCAo
UnVubmluZyBUaW1lOilfEBlTdGF0aWMgVGV4dCAoRG93bmxvYWRlZDopXxAZVGV4dCBGaWVsZCBDZWxs
IChMYWJlbCktMV8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLThfEA9XaW5kb3cgKFdpbmRvdylfEBlU
ZXh0IEZpZWxkIENlbGwgKExhYmVsKS01XxATU3RhdGljIFRleHQgKExhYmVsKV8QFVN0YXRpYyBUZXh0
IChMYWJlbCktMV8QFVN0YXRpYyBUZXh0IChMYWJlbCktMl8QH1RleHQgRmllbGQgQ2VsbCAoUnVubmlu
ZyBUaW1lOilcRmlsZSdzIE93bmVyXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktMlxDb250ZW50IFZp
ZXdfEBRTdGF0aWMgVGV4dCAoUmF0aW86KV8QFVN0YXRpYyBUZXh0IChMYWJlbCktM18QG1RleHQgRmll
bGQgQ2VsbCAoVXBsb2FkZWQ6KV8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTRfEBlUZXh0IEZpZWxk
IENlbGwgKExhYmVsKS02XxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktN18QHlN0YXRpYyBUZXh0IChQ
cm9ncmFtIFN0YXJ0ZWQ6KV8QFVN0YXRpYyBUZXh0IChMYWJlbCktNF8QHVRleHQgRmllbGQgQ2VsbCAo
RG93bmxvYWRlZDopXxAXVGV4dCBGaWVsZCBDZWxsIChMYWJlbClfEBVTdGF0aWMgVGV4dCAoTGFiZWwp
LTVfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLTZbQXBwbGljYXRpb25fEBVTdGF0aWMgVGV4dCAoTGFiZWwp
LTdfEBhUZXh0IEZpZWxkIENlbGwgKFJhdGlvOilfEBlUZXh0IEZpZWxkIENlbGwgKExhYmVsKS0zXxAV
U3RhdGljIFRleHQgKExhYmVsKS040gAOAD4CEgLDgHKg0gAOAD4CEgLGgHKg0gAOAD4CEgLJgHKvECsB
xwB1AUwAeAB2AX0BnQG9AEEBHAB7AcAAgACBAcIBxgD5AB8AUQCKAHcAfwGNAcUBPAEKAV0AfQB8Ab8B
wwDXASwAegG+AHkBwQIuAH4BxADoAW0AgoBtgBCAPIApgCGARoBMgFiAB4AzgDSAX4BEgEeAY4BrgCuA
AoANgBKAJYBBgEmAaYA5gC+AQIA6gDeAXYBlgCOANoAxgFuALYBhgHCAPoBngCeAQ4BK0gAOAD4CEgL3
gYCCgIOAhICFgIaAh4CIgImAioCLgIyAjYCOgI+AkICRgJKAk4CUgJVfECJUZXh0IEZpZWxkIENlbGwg
KFByb2dyYW0gU3RhcnRlZDopXxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktM1xGaWxlJ3MgT3duZXJf
EBdTdGF0aWMgVGV4dCAoVXBsb2FkZWQ6KV8QE1N0YXRpYyBUZXh0IChMYWJlbClbQXBwbGljYXRpb25f
EBlUZXh0IEZpZWxkIENlbGwgKExhYmVsKS0yXxAYVGV4dCBGaWVsZCBDZWxsIChSYXRpbzopXxAZVGV4
dCBGaWVsZCBDZWxsIChMYWJlbCktNV8QGVRleHQgRmllbGQgQ2VsbCAoTGFiZWwpLTZfEBtUZXh0IEZp
ZWxkIENlbGwgKFVwbG9hZGVkOilfEBlUZXh0IEZpZWxkIENlbGwgKExhYmVsKS03XxAVU3RhdGljIFRl
eHQgKExhYmVsKS0xXxAeU3RhdGljIFRleHQgKFByb2dyYW0gU3RhcnRlZDopXxAfVGV4dCBGaWVsZCBD
ZWxsIChSdW5uaW5nIFRpbWU6KV8QFVN0YXRpYyBUZXh0IChMYWJlbCktMl8QFVN0YXRpYyBUZXh0IChM
YWJlbCktM18QFVN0YXRpYyBUZXh0IChMYWJlbCktNF8QFFN0YXRpYyBUZXh0IChSYXRpbzopXxAPV2lu
ZG93IChXaW5kb3cpXxAVU3RhdGljIFRleHQgKExhYmVsKS01XxAVU3RhdGljIFRleHQgKExhYmVsKS02
XxAZVGV4dCBGaWVsZCBDZWxsIChMYWJlbCktMV8QGVN0YXRpYyBUZXh0IChEb3dubG9hZGVkOilfEBtT
dGF0aWMgVGV4dCAoUnVubmluZyBUaW1lOilfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLTdcQ29udGVudCBW
aWV3XxAXVGV4dCBGaWVsZCBDZWxsIChMYWJlbClfEBVTdGF0aWMgVGV4dCAoTGFiZWwpLThfEBlUZXh0
IEZpZWxkIENlbGwgKExhYmVsKS00XxAdVGV4dCBGaWVsZCBDZWxsIChEb3dubG9hZGVkOilfEBlUZXh0
IEZpZWxkIENlbGwgKExhYmVsKS040gAOAD4CEgLDgHKg0gAOAD4CEgLGgHKg0gAOAD4CEgLJgHKvECsB
TAG+AcEBxwEcAB8AdQB+AhgA6AF9ATwBnQG9Ab8BwACKAW0BwwHEAcUAfQCBAcYA+QCCAHoAewB3AEEA
gAB8ASwAdgB4AH8AUQDXAHkBCgFdAY0BwoA8gFuAYYBtgDOAAoAQgD6AcIAngEaAOYBMgFiAXYBfgBKA
Q4BlgGeAaYA6gEeAa4ArgEqAMYA0gCWAB4BEgDeANoAhgCmAQYANgCOALYAvgECASYBj0gAOAD4CEgL3
gHKvECsC+AL5AvoC+wL8Av0C/gL/AwADAQMCAwMDBAMFAwYDBwMIAwkDCgMLAwwDDQMOAw8DEAMRAxID
EwMUAxUDFgMXAxgDGQMaAxsDHAMdAx4DHwMgAyEDIoCagJuAnICdgJ6An4CggKGAooCjgKSApYCmgKeA
qICpgKqAq4CsgK2AroCvgLCAsYCygLOAtIC1gLaAt4C4gLmAuoC7gLyAvYC+gL+AwIDBgMKAw4DEEDEQ
JhANEAUQKxAvEB0QARASEBMQIhAqECwQIRAfEA4QNBAEEAsQKBAtEDIQFhAlECMQFRAwECcQFBAREB4Q
IBP//////////RAkEDMQDBApEC7SAA4APgBzA0uATaDSAA4APgISA06AcqDSAA4APgISA1GAcqDSADcA
OANTA1SiA1QAO15OU0lCT2JqZWN0RGF0YQAIABkAIgAnADEAOgA/AEQAUgBUAGYB+wIBAkwCUwJaAmgC
egKWAqQCsAK8AsoC1QLjAv8DDQMgAzIDTANWA2MDZQNnA2kDawNtA28DcQNzA3UDdwN5A3sDfQN/A4ED
gwOFA4cDkAOcA54DoAO4A8EDygPVA9oD6QPyBAUEDgQZBBsEHgQgBF8EbASFBJIEqAS2BMAEzgTnBPQE
/gUQBSQFLgU6BTwFPgVABUIFRAVGBUsFTQVPBVEFUwVVBVcFWQVbBXYFgQWJBZQFsQXDBc4F1wXjBewF
+AX6BfwF/gYBBgMGBQYHBhAGEgYvBjEGMwY1BjcGOQY7Bj0GPwZBBkMGRQZHBkkGSwZsBnQGewaFBocG
iQaLBo0GkAaRBpMGlQatBs4G2gbuBvkHAwcRBx4HKgcvBzEHMwc1BzcHOQc+B0AHSgdbB2IHaQdyB3QH
fQd/B4EHjgeXB5wHowe4B8AHzQfZB+cH6QfrB+0H7wfxB/gIBQgSCBoIHAgeCCoIMwg4CE0ITwhRCFMI
VQhoCHUIdwh6CIMIjAieCKsItAi/CMsI1QjcCOgJCQkLCQ0JDwkRCRIJFAkWCS4JTwlRCVMJVQlXCVkJ
WwlnCYgJigmMCY4JkAmRCZMJlQmsCc0JzwnRCdMJ1QnXCdkJ4AoBCgMKBQoHCgkKCgoMCg4KJQpGCkgK
SgpMCk4KUApSCmAKgQqDCoUKhwqJCowKjQqPCpEKqwrMCs4K0ArSCtQK1grYCt4K/wsBCwMLBQsHCwgL
CgsMCyYLRwtJC0sLTQtPC1ELUwt0C3YLeAt6C3wLfQt/C4ELmgu7C70LvwvBC8MLxQvHC+gL6gvsC+4L
8AvxC/ML9QwODC8MMQwzDDUMNww5DDsMXAxeDGAMYgxkDGUMZwxpDIAMoQyjDKUMpwypDKsMrQzADOEM
4wzlDOcM6QzqDOwM7g0HDSgNKg0sDS4NMA0yDTQNVQ1XDVkNWw1dDV4NYA1iDXwNnQ2fDaENow2lDacN
qQ3KDcwNzg3QDdIN0w3VDdcN8Q4SDhQOFg4YDhoOHA4eDj8OQQ5DDkUORw5IDkoOTA5lDoYOiA6KDowO
jg6QDpIOsw61DrcOuQ67DrwOvg7ADtkO+g78Dv4PAA8CDwQPCQ8LDxQPGw8qDzIPOw9CD1sPZg9yD3sP
gA+TD5wPow+wD7YPvw/BD9gP2g/cD94P4A/iD+QP5g/oD+oP7A/uD/8QDRAWEB4QIBAiECQQJhAtEDYQ
PRBUEGMQdBB2EHgQehB8EIUQlhCYEJoQnBCeELIQwxDFEMcQyRDLENYQ5xDpEOsQ7RDvEQIRExEVERcR
GREbEScROBE6ETwRPhFAEVIRYxFlEWcRaRFrEXkRihGMEY4RkBGSEaERshG0EbYRuBG6EckR2hHcEd4R
4BHiEfgSARIDEkQSRhJIEkoSTBJOElASUhJUElYSWBJaElwSXhJgEmISZBJmEmgSahJsEm4ScBJyEnQS
dhJ4EnoSfBJ+EoASghKLEo0SjxKdEqYSqxK0ErYS9xL5EvsS/RL/EwETAxMFEwcTCRMLEw0TDxMRExMT
FRMXExkTGxMdEx8TIRMjEyUTJxMpEysTLRMvEzETMxM1Ez4TQBODE4UThxOJE4sTjROPE5ETkxOVE5cT
mRObE50TnxOhE6MTpROnE6kTqxOtE68TsROzE7UTtxO5E7sTvRO/E8ETwxPME84UERQTFBUUFxQZFBsU
HRQfFCEUIxQlFCcUKRQrFC0ULxQxFDMUNRQ3FDkUOxQ9FD8UQRRDFEUURxRJFEsUTRRPFFEUaxSQFK4U
yhTmFQIVFBUwFUYVXhV2FZgVpRXBFc4V5RX9FhsWNxZTFm8WkBaoFsgW4hb6FxIXHhc2F1EXbReFF44X
kBeRF5oXnBedF6YXqBgBGAMYBRgHGAkYCxgNGA8YERgTGBUYFxgZGBsYHRgfGCEYIxglGCcYKRgrGC0Y
LxgxGDMYNRg3GDkYOxg9GD8YQRhDGEUYRxhJGEsYTRhPGFEYUxhVGFcYYBhiGLsYvRi/GMEYwxjFGMcY
yRjLGM0YzxjRGNMY1RjXGNkY2xjdGN8Y4RjjGOUY5xjpGOsY7RjvGPEY8xj1GPcY+Rj7GP0Y/xkBGQMZ
BRkHGQkZCxkNGQ8ZERkTGRUZFxkZGRsZHRkfGSEZIxklGScZKRkrGS0ZLxkxGTMZNRk3GTkZOxk9GT8Z
QRlDGUUZRxlJGUsZTRlPGVEZWhlcGV4ZYBliGWQZbRlvGXAZeRl7GXwZhRmHGYgZkRmWAAAAAAAAAgIA
AAAAAAADVQAAAAAAAAAAAAAAAAAAGaU</bytes>
qICpgKqAq4CsgK2AroCvgLCAsYCygLOAtIC1gLaAt4C4gLmAuoC7gLyAvYC+gL+AwIDBgMKAw4DEECYQ
HxAgECcQEhA0ECQT//////////0QDBArEBYQLxAwEDMQMRAEECkQIRAdEDIQIxAsEB4QDhAuEBEQExAL
EAEQKhAVEBQQBRANECgQDxAlEC0QItIADgA+AHMDTIBNoNIADgA+AhIDT4ByoNIADgA+AhIDUoByoNIA
NwA4A1QDVaIDVQA7Xk5TSUJPYmplY3REYXRhAAgAGQAiACcAMQA6AD8ARABSAFQAZgH7AgECTAJTAloC
aAJ6ApYCpAKwArwCygLVAuMC/wMNAyADMgNMA1YDYwNlA2cDaQNrA20DbwNxA3MDdQN3A3kDewN9A38D
gQODA4UDhwOQA5wDngOgA7gDwQPKA9UD2gPpA/IEBQQOBBkEGwQeBCAEXwRsBIUEkgSoBLYEwATOBOcE
9AT+BRAFJAUuBToFPAU+BUAFQgVEBUYFSwVNBU8FUQVTBVUFVwVZBVsFdgWBBYkFlAWxBcMFzgXXBeMF
7AX4BfoF/AX+BgEGAwYFBgcGEAYSBi8GMQYzBjUGNwY5BjsGPQY/BkEGQwZFBkcGSQZLBmwGdAZ7BoUG
hwaJBosGjQaQBpEGkwaVBq0GzgbaBu4G+QcDBxEHHgcqBy8HMQczBzUHNwc5Bz4HQAdKB1sHYgdpB3IH
dAd9B38HgQeOB5cHnAejB7gHwAfNB9kH5wfpB+sH7QfvB/EH+AgFCBIIGggcCB4IKggzCDgITQhPCFEI
UwhVCGgIdQh3CHoIgwiMCJ4Iqwi0CL8IywjVCNwI6AkJCQsJDQkPCREJEgkUCRYJLglPCVEJUwlVCVcJ
WQlbCWcJiAmKCYwJjgmQCZEJkwmVCawJzQnPCdEJ0wnVCdcJ2QngCgEKAwoFCgcKCQoKCgwKDgolCkYK
SApKCkwKTgpQClIKYAqBCoMKhQqHCokKjAqNCo8KkQqrCswKzgrQCtIK1ArWCtgK3gr/CwELAwsFCwcL
CAsKCwwLJgtHC0kLSwtNC08LUQtTC3QLdgt4C3oLfAt9C38LgQuaC7sLvQu/C8ELwwvFC8cL6AvqC+wL
7gvwC/EL8wv1DA4MLwwxDDMMNQw3DDkMOwxcDF4MYAxiDGQMZQxnDGkMgAyhDKMMpQynDKkMqwytDMAM
4QzjDOUM5wzpDOoM7AzuDQcNKA0qDSwNLg0wDTINNA1VDVcNWQ1bDV0NXg1gDWINfA2dDZ8NoQ2jDaUN
pw2pDcoNzA3ODdAN0g3TDdUN1w3xDhIOFA4WDhgOGg4cDh4OPw5BDkMORQ5HDkgOSg5MDmUOhg6IDooO
jA6ODpAOkg6zDrUOtw65DrsOvA6+DsAO2Q76DvwO/g8ADwIPBA8JDwsPFA8bDyoPMg87D0IPWw9mD3IP
ew+AD5MPnA+jD7APtg+/D8EP2A/aD9wP3g/gD+IP5A/mD+gP6g/sD+4P/xANEBYQHhAgECIQJBAmEDoQ
QxBKEGEQcBCBEIMQhRCHEIkQmBCpEKsQrRCvELEQvxDQENIQ1BDWENgQ7hD/EQERAxEFEQcRGhErES0R
LxExETMRPhFPEVERUxFVEVcRYxF0EXYReBF6EXwRgxGUEZYRmBGaEZwRqxG8Eb4RwBHCEcQRzRHeEeAR
4hHkEeYR+BIBEgMSRBJGEkgSShJMEk4SUBJSElQSVhJYEloSXBJeEmASYhJkEmYSaBJqEmwSbhJwEnIS
dBJ2EngSehJ8En4SgBKCEosSjRKPEp0SphKrErQSthL3EvkS+xL9Ev8TARMDEwUTBxMJEwsTDRMPExET
ExMVExcTGRMbEx0THxMhEyMTJRMnEykTKxMtEy8TMRMzEzUTPhNAE4MThROHE4kTixONE48TkROTE5UT
lxOZE5sTnROfE6EToxOlE6cTqROrE60TrxOxE7MTtRO3E7kTuxO9E78TwRPDE8wTzhQRFBMUFRQXFBkU
GxQdFB8UIRQjFCUUJxQpFCsULRQvFDEUMxQ1FDcUORQ7FD0UPxRBFEMURRRHFEkUSxRNFE8UURR2FJIU
nxS5FM8U2xT3FRIVLhVKFWgVhBWcFb0V3xX3Fg8WJxY+FlAWaBaAFpwWuBbWFu4W+xcVFy0XSRdpF4UX
jheQF5EXmhecF50XpheoGAEYAxgFGAcYCRgLGA0YDxgRGBMYFRgXGBkYGxgdGB8YIRgjGCUYJxgpGCsY
LRgvGDEYMxg1GDcYORg7GD0YPxhBGEMYRRhHGEkYSxhNGE8YURhTGFUYVxhgGGIYuxi9GL8YwRjDGMUY
xxjJGMsYzRjPGNEY0xjVGNcY2RjbGN0Y3xjhGOMY5RjnGOkY6xjtGO8Y8RjzGPUY9xj5GPsY/Rj/GQEZ
AxkFGQcZCRkLGQ0ZDxkRGRMZFRkXGRkZGxkdGR8ZKBkqGSwZLhkwGTIZNBk2GTgZOhk8GT4ZQBlCGUQZ
RhlIGUoZTBlOGVAZUhlUGVYZWBlaGVwZXhlgGWIZZBlmGW8ZcRlyGXsZfRl+GYcZiRmKGZMZmAAAAAAA
AAICAAAAAAAAA1YAAAAAAAAAAAAAAAAAABmnA</bytes>
</object>
</data>
</archive>

View File

@ -862,34 +862,36 @@ typedef enum
break;
}
switch ([[peer objectForKey: @"Status"] intValue])
{
case TR_PEER_STATUS_HANDSHAKE:
[components addObject: NSLocalizedString(@"Handshaking", "peer -> status")];
break;
case TR_PEER_STATUS_PEER_IS_CHOKED:
[components addObject: NSLocalizedString(@"Peer is Choked", "peer -> status")];
break;
case TR_PEER_STATUS_CLIENT_IS_CHOKED:
[components addObject: NSLocalizedString(@"Choked", "peer -> status")];
break;
case TR_PEER_STATUS_CLIENT_IS_INTERESTED:
[components addObject: NSLocalizedString(@"Choked & Interested", "peer -> status")];
break;
case TR_PEER_STATUS_READY:
[components addObject: NSLocalizedString(@"Ready", "peer -> status")];
break;
case TR_PEER_STATUS_REQUEST_SENT:
[components addObject: NSLocalizedString(@"Request Sent", "peer -> status")];
break;
case TR_PEER_STATUS_ACTIVE:
[components addObject: NSLocalizedString(@"Active", "peer -> status")];
break;
case TR_PEER_STATUS_ACTIVE_AND_CHOKED:
[components addObject: NSLocalizedString(@"Active & Interested", "peer -> status")];
break;
int status = [[peer objectForKey: @"Status"] intValue];
if (status & TR_PEER_STATUS_HANDSHAKE)
[components addObject: NSLocalizedString(@"Handshaking", "peer -> status")];
else
{
NSString * firstString;
if (status & TR_PEER_STATUS_CLIENT_IS_SENDING)
firstString = NSLocalizedString(@"Uploading to peer", "peer -> status");
else if (status & TR_PEER_STATUS_PEER_IS_INTERESTED)
firstString = NSLocalizedString(@"Peer wants our data", "peer -> status");
else if (status & TR_PEER_STATUS_PEER_IS_CHOKED)
firstString = NSLocalizedString(@"Refusing to send data to peer", "peer -> status");
else
firstString = @"";
NSString * secondString;
if (status & TR_PEER_STATUS_PEER_IS_SENDING)
secondString = NSLocalizedString(@"Downloading from peer", "peer -> status");
else if (status & TR_PEER_STATUS_CLIENT_SENT_REQUEST)
secondString = NSLocalizedString(@"Requesting data from peer", "peer -> status");
else if (status & TR_PEER_STATUS_CLIENT_IS_INTERESTED)
secondString = NSLocalizedString(@"Waiting to request data from peer", "peer -> status");
else if (status & TR_PEER_STATUS_CLIENT_IS_CHOKED)
secondString = NSLocalizedString(@"Peer will not send us data", "peer -> status");
else
secondString = @"";
[components addObject: [NSString stringWithFormat: @"%@ - %@", firstString, secondString]];
}
return [components componentsJoinedByString: @"\n"];
}
return nil;