Changeset 292

Timestamp:

Jun 8, 2006, 4:44:45 AM (16 years ago)

Author:

joshe

Message:

Revert the last commit, it wasn't supposed to go on the trunk.

Files:

• branches/save_torrent_files/Transmission.xcodeproj/project.pbxproj (modified) (8 diffs)
• trunk/macosx/Controller.h (modified) (2 diffs)
• trunk/macosx/Controller.m (modified) (9 diffs)
• trunk/macosx/Defaults.plist (modified) (2 diffs)
• trunk/macosx/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• trunk/macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• trunk/macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib (modified) (2 diffs)
• trunk/macosx/English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• trunk/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• trunk/macosx/PrefsController.h (modified) (2 diffs)
• trunk/macosx/PrefsController.m (modified) (5 diffs)
• trunk/macosx/Torrent.h (modified) (3 diffs)
• trunk/macosx/Torrent.m (modified) (10 diffs)

branches/save_torrent_files/Transmission.xcodeproj/project.pbxproj

@@ -81 +81 @@
                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.tiff */; };
                 A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
+                A2495B6D0A2F697C0098B31F /* ResumeSelected.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2495B6B0A2F697C0098B31F /* ResumeSelected.tiff */; };
+                A2495B6E0A2F697D0098B31F /* PauseSelected.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2495B6C0A2F697C0098B31F /* PauseSelected.tiff */; };
                 A2519D490A2FADFC00479D0C /* SmoothAquaView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2519D470A2FADFC00479D0C /* SmoothAquaView.m */; };
                 A2519D4A0A2FADFC00479D0C /* SmoothAquaView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2519D480A2FADFC00479D0C /* SmoothAquaView.h */; };
@@ -93 +95 @@
                 A2D5CCFD0A2661590089A8C2 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D5CCFC0A2661590089A8C2 /* Sparkle.framework */; };
                 A2D5CD100A2661610089A8C2 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D5CCFC0A2661590089A8C2 /* Sparkle.framework */; };
-                A2DB22970A37CA4200489FF1 /* PauseSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2DB22950A37CA4200489FF1 /* PauseSelected.png */; };
-                A2DB22980A37CA4200489FF1 /* ResumeSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2DB22960A37CA4200489FF1 /* ResumeSelected.png */; };
                 A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
                 A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A2F8951E0A2D4BA500ED2127 /* Credits.rtf */; };
@@ -123 +123 @@
                         dstSubfolderSpec = 10;
                         files = (
-                                A2DB22970A37CA4200489FF1 /* PauseSelected.png in CopyFiles */,
-                                A2DB22980A37CA4200489FF1 /* ResumeSelected.png in CopyFiles */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -222 +220 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };
@@ -250 +248 @@
                 A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ActionButtonPressed.tiff; path = macosx/Images/ActionButtonPressed.tiff; sourceTree = "<group>"; };
                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
+                A2495B6B0A2F697C0098B31F /* ResumeSelected.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResumeSelected.tiff; path = macosx/Images/ResumeSelected.tiff; sourceTree = "<group>"; };
+                A2495B6C0A2F697C0098B31F /* PauseSelected.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PauseSelected.tiff; path = macosx/Images/PauseSelected.tiff; sourceTree = "<group>"; };
                 A2519D470A2FADFC00479D0C /* SmoothAquaView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SmoothAquaView.m; path = macosx/SmoothAquaView.m; sourceTree = "<group>"; };
                 A2519D480A2FADFC00479D0C /* SmoothAquaView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SmoothAquaView.h; path = macosx/SmoothAquaView.h; sourceTree = "<group>"; };
@@ -262 +262 @@
                 A2C655640A04FEDC00E9FD82 /* BottomBorder.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BottomBorder.tiff; path = macosx/Images/BottomBorder.tiff; sourceTree = "<group>"; };
                 A2D5CCFC0A2661590089A8C2 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
-                A2DB22950A37CA4200489FF1 /* PauseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseSelected.png; path = macosx/Images/PauseSelected.png; sourceTree = "<group>"; };
-                A2DB22960A37CA4200489FF1 /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = "<group>"; };
                 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -355 +353 @@
                         children = (
                                 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */,
-                                A2DB22950A37CA4200489FF1 /* PauseSelected.png */,
-                                A2DB22960A37CA4200489FF1 /* ResumeSelected.png */,
+                                A2495B6B0A2F697C0098B31F /* ResumeSelected.tiff */,
+                                A2495B6C0A2F697C0098B31F /* PauseSelected.tiff */,
                                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */,
                                 A27A53640A06AED200E1F16F /* StatusBorder.tiff */,
@@ -622 +620 @@
                                 A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */,
                                 A2F8951F0A2D4BA500ED2127 /* Credits.rtf in Resources */,
+                                A2495B6D0A2F697C0098B31F /* ResumeSelected.tiff in Resources */,
+                                A2495B6E0A2F697D0098B31F /* PauseSelected.tiff in Resources */,
                                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.tiff in Resources */,
                                 A28DBADC0A33C1D800F4B4A7 /* ActionButton.tiff in Resources */,

trunk/macosx/Controller.h

@@ -97 +97 @@
 
 - (void) removeTorrent:                 (id) sender;
+- (void) removeTorrentDeleteTorrent:    (id) sender;
 - (void) removeTorrentDeleteData:       (id) sender;
+- (void) removeTorrentDeleteBoth:       (id) sender;
 - (void) removeTorrentWithIndex:        (NSIndexSet *) indexSet
+                deleteTorrent:          (BOOL) deleteTorrent
                 deleteData:             (BOOL) deleteData;
                 
@@ -104 +107 @@
                         contextInfo: (NSDictionary *) dict;
 - (void) confirmRemoveTorrents: (NSArray *) torrents
+            deleteTorrent: (BOOL) deleteTorrent
             deleteData: (BOOL) deleteData;
 

trunk/macosx/Controller.m

@@ -525 +525 @@
 
 - (void) removeTorrentWithIndex: (NSIndexSet *) indexSet
+                  deleteTorrent: (BOOL) deleteTorrent
                      deleteData: (BOOL) deleteData
 {
@@ -540 +541 @@
         NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys:
             torrents, @"Torrents",
+            [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent",
             [NSNumber numberWithBool: deleteData], @"DeleteData",
             nil];
@@ -571 +573 @@
     {
         [self confirmRemoveTorrents: torrents
+                deleteTorrent: deleteTorrent
                 deleteData: deleteData];
     }
@@ -581 +584 @@
 
     NSArray * torrents = [dict objectForKey: @"Torrents"];
+    BOOL deleteTorrent = [[dict objectForKey: @"DeleteTorrent"] boolValue];
     BOOL deleteData = [[dict objectForKey: @"DeleteData"] boolValue];
     [dict release];
@@ -587 +591 @@
     {
         [self confirmRemoveTorrents: torrents
+            deleteTorrent: deleteTorrent
             deleteData: deleteData];
     }
@@ -594 +599 @@
 
 - (void) confirmRemoveTorrents: (NSArray *) torrents
+            deleteTorrent: (BOOL) deleteTorrent
             deleteData: (BOOL) deleteData
 {
@@ -604 +610 @@
         if( deleteData )
             [torrent trashData];
-
-        [torrent removeForever];
+            
+        if( deleteTorrent )
+            [torrent trashTorrent];
+
         [fTorrents removeObject: torrent];
     }
@@ -618 +626 @@
 - (void) removeTorrent: (id) sender
 {
-    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteData: NO];
+    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteTorrent: NO deleteData: NO];
+}
+
+- (void) removeTorrentDeleteTorrent: (id) sender
+{
+    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteTorrent: YES deleteData: NO];
 }
 
 - (void) removeTorrentDeleteData: (id) sender
 {
-    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteData: YES];
+    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteTorrent: NO deleteData: YES];
+}
+
+- (void) removeTorrentDeleteBoth: (id) sender
+{
+    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteTorrent: YES deleteData: YES];
 }
 
@@ -1192 +1210 @@
 
     //enable remove items
-    if (action == @selector(removeTorrent:) || action == @selector(removeTorrentDeleteData:))
+    if (action == @selector(removeTorrent:)
+        || action == @selector(removeTorrentDeleteTorrent:)
+        || action == @selector(removeTorrentDeleteData:)
+        || action == @selector(removeTorrentDeleteBoth:))
     {
         BOOL active = NO;

trunk/macosx/Defaults.plist

@@ -19 +19 @@
         <key>CheckUpload</key>
         <true/>
-        <key>DeleteOriginalTorrent</key>
-        <false/>
         <key>DownloadChoice</key>
         <string>Constant</string>
@@ -43 +41 @@
         <key>SUScheduledCheckInterval</key>
         <integer>86400</integer>
-        <key>SavePrivateTorrent</key>
-        <true/>
         <key>ShowInspector</key>
         <false/>

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -10 +10 @@
                 openShowSheet = id; 
                 removeTorrent = id; 
+                removeTorrentDeleteBoth = id; 
                 removeTorrentDeleteData = id; 
+                removeTorrentDeleteTorrent = id; 
                 resumeAllTorrents = id; 
                 resumeTorrent = id; 

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -30 +30 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>29</integer>
+                <integer>21</integer>
                 <integer>1480</integer>
-                <integer>21</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

@@ -11 +11 @@
                 setLimit = id; 
                 setLimitCheck = id; 
-                setMoveTorrent = id; 
                 setPort = id; 
                 setRatio = id; 
@@ -24 +23 @@
                 fBadgeDownloadRateCheck = NSButton; 
                 fBadgeUploadRateCheck = NSButton; 
-                fCopyTorrentCheck = NSButton; 
-                fDeleteOriginalTorrentCheck = NSButton; 
                 fDownloadCheck = NSButton; 
                 fDownloadField = NSTextField; 

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>28</key>
-                <string>345 472 462 212 0 0 1152 842 </string>
+                <string>347 472 462 212 0 0 1152 842 </string>
                 <key>41</key>
-                <string>262 506 462 274 0 0 1152 842 </string>
+                <string>345 461 462 234 0 0 1152 842 </string>
                 <key>66</key>
                 <string>347 526 462 104 0 0 1152 842 </string>

trunk/macosx/PrefsController.h

@@ -37 +37 @@
     IBOutlet NSButton       * fQuitCheck, * fRemoveCheck,
                             * fBadgeDownloadRateCheck, * fBadgeUploadRateCheck,
-                            * fAutoStartCheck, * fCopyTorrentCheck, * fDeleteOriginalTorrentCheck;
+                            * fAutoStartCheck;                           
     IBOutlet NSPopUpButton  * fUpdatePopUp;
 
@@ -59 +59 @@
 - (void) checkUpdate;
 - (void) setAutoStart:          (id) sender;
-- (void) setMoveTorrent:        (id) sender;
 - (void) setDownloadLocation:   (id) sender;
 - (void) folderSheetShow:       (id) sender;

trunk/macosx/PrefsController.m

@@ -117 +117 @@
     int uploadLimit = [fDefaults integerForKey: @"UploadLimit"];
     
-    [fUploadCheck setState: checkUpload];
+    [fUploadCheck setState: checkUpload ? NSOnState : NSOffState];
     [fUploadField setIntValue: uploadLimit];
     [fUploadField setEnabled: checkUpload];
@@ -127 +127 @@
     int downloadLimit = [fDefaults integerForKey: @"DownloadLimit"];
     
-    [fDownloadCheck setState: checkDownload];
+    [fDownloadCheck setState: checkDownload ? NSOnState : NSOffState];
     [fDownloadField setIntValue: downloadLimit];
     [fDownloadField setEnabled: checkDownload];
@@ -135 +135 @@
     //set ratio limit
     BOOL ratioCheck = [fDefaults boolForKey: @"RatioCheck"];
-    [fRatioCheck setState: ratioCheck];
+    [fRatioCheck setState: ratioCheck ? NSOnState : NSOffState];
     [fRatioField setEnabled: ratioCheck];
     [fRatioField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
     
     //set remove and quit prompts
-    [fQuitCheck setState: [fDefaults boolForKey: @"CheckQuit"]];
-    [fRemoveCheck setState: [fDefaults boolForKey: @"CheckRemove"]];
+    [fQuitCheck setState: [fDefaults boolForKey: @"CheckQuit"] ?
+        NSOnState : NSOffState];
+    [fRemoveCheck setState: [fDefaults boolForKey: @"CheckRemove"] ?
+        NSOnState : NSOffState];
 
     //set dock badging
@@ -149 +151 @@
     //set auto start
     [fAutoStartCheck setState: [fDefaults boolForKey: @"AutoStartDownload"]];
-    
-    //set private torrents
-    BOOL copyTorrents = [fDefaults boolForKey: @"SavePrivateTorrent"];
-    [fCopyTorrentCheck setState: copyTorrents];
-    
-    [fDeleteOriginalTorrentCheck setEnabled: copyTorrents];
-    [fDeleteOriginalTorrentCheck setState: [fDefaults boolForKey: @"DeleteOriginalTorrent"]];
 
     //set update check
@@ -423 +418 @@
 {
     [fDefaults setBool: [sender state] forKey: @"AutoStartDownload"];
-}
-
-- (void) setMoveTorrent: (id) sender
-{
-    int state = [sender state];
-    if (sender == fCopyTorrentCheck)
-    {
-        [fDefaults setBool: state forKey: @"SavePrivateTorrent"];
-        
-        [fDeleteOriginalTorrentCheck setEnabled: state];
-        if (state == NSOffState)
-        {
-            [fDeleteOriginalTorrentCheck setState: NSOffState];
-            [fDefaults setBool: NO forKey: @"DeleteOriginalTorrent"];
-        }
-    }
-    else
-        [fDefaults setBool: state forKey: @"DeleteOriginalTorrent"];
 }
 

trunk/macosx/Torrent.h

@@ -36 +36 @@
     tr_info_t    * fInfo;
     tr_stat_t    * fStat;
-    
     BOOL         fResumeOnWake;
     NSDate       * fDate;
-    
-    BOOL        fPrivateSaved;
 
     NSUserDefaults  * fDefaults;
@@ -59 +56 @@
 - (void)       getAvailability: (int8_t *) tab size: (int) size;
 
-- (void)        update;
-- (void)        start;
-- (void)        stop;
-- (void)        removeForever;
-- (void)        sleep;
-- (void)        wakeUp;
+- (void)       update;
+- (void)       start;
+- (void)       stop;
+- (void)       sleep;
+- (void)       wakeUp;
 
 - (float)       ratio;
@@ -73 +69 @@
 
 - (void)        reveal;
+- (void)        trashTorrent;
 - (void)        trashData;
 

trunk/macosx/Torrent.m

@@ -29 +29 @@
 @interface Torrent (Private)
 
+- (void) trashPath: (NSString *) path;
 - (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib date: (NSDate *) date
         stopRatioSetting: (NSNumber *) stopRatioSetting ratioLimit: (NSNumber *) ratioLimit;
-- (id) initWithHash: (NSString *) hashString lib: (tr_handle_t *) lib date: (NSDate *) date
-        stopRatioSetting: (NSNumber *) stopRatioSetting ratioLimit: (NSNumber *) ratioLimit;
-- (id) initForSuccessWithDate: (NSDate *) date stopRatioSetting: (NSNumber *)
-            stopRatioSetting ratioLimit: (NSNumber *) ratioLimit;
-
-- (void) trashPath: (NSString *) path;
 
 @end
@@ -45 +40 @@
 - (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib
 {
-    id torrent = [self initWithPath: path lib: lib
-                    date: nil stopRatioSetting: nil
-                    ratioLimit: nil];
-    NSLog(path);
-    if (fPrivateSaved && [fDefaults boolForKey: @"DeleteOriginalTorrent"])
-        [self trashPath: path];
-    
-    return torrent;
+    return [self initWithPath: path lib: lib
+            date: nil stopRatioSetting: nil
+            ratioLimit: nil];
 }
 
 - (id) initWithHistory: (NSDictionary *) history lib: (tr_handle_t *) lib
 {
-    NSNumber * privateCopy;
-    if ((privateCopy = [history objectForKey: @"PrivateCopy"]) && [privateCopy boolValue])
-        self = [self initWithHash: [history objectForKey: @"TorrentHash"]
-            lib: lib date: [history objectForKey: @"Date"]
-            stopRatioSetting: [history objectForKey: @"StopRatioSetting"]
-            ratioLimit: [history objectForKey: @"RatioLimit"]];
-    else
-        self = [self initWithPath: [history objectForKey: @"TorrentPath"]
+    self = [self initWithPath: [history objectForKey: @"TorrentPath"]
             lib: lib date: [history objectForKey: @"Date"]
             stopRatioSetting: [history objectForKey: @"StopRatioSetting"]
@@ -86 +69 @@
 - (NSDictionary *) history
 {
-    NSMutableDictionary * history = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                    [NSNumber numberWithBool: fPrivateSaved], @"PrivateCopy",
-                    [self downloadFolder], @"DownloadFolder",
-                    [self isActive] ? @"NO" : @"YES", @"Paused",
-                    [self date], @"Date",
-                    [NSNumber numberWithInt: fStopRatioSetting], @"StopRatioSetting",
-                    [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit", nil];
-            
-    if (fPrivateSaved)
-        [history setObject: [self torrentLocation] forKey: @"TorrentPath"];
-    else
-        [history setObject: [self hashString] forKey: @"TorrentHash"];
-    
-    return history;
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+            [self torrentLocation], @"TorrentPath",
+            [self downloadFolder], @"DownloadFolder",
+            [self isActive] ? @"NO" : @"YES", @"Paused",
+            [self date], @"Date",
+            [NSNumber numberWithInt: fStopRatioSetting], @"StopRatioSetting",
+            [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit", nil];
 }
 
@@ -237 +213 @@
 }
 
-- (void) removeForever
-{
-    tr_torrentRemoveSaved(fHandle);
-}
-
 - (void) sleep
 {
@@ -291 +262 @@
 }
 
+- (void) trashTorrent
+{
+    [self trashPath: [self torrentLocation]];
+}
+
 - (void) trashData
 {
@@ -339 +315 @@
 - (NSString *) hashString
 {
-    /*NSMutableString * string = [NSMutableString
+    NSMutableString * string = [NSMutableString
         stringWithCapacity: SHA_DIGEST_LENGTH];
     int i;
@@ -346 +322 @@
         [string appendFormat: @"%02x", fInfo->hash[i]];
     }
-    return string;*/
-    
-    return [NSString stringWithUTF8String: fInfo->hashString];
+    return string;
 }
 
 - (NSString *) torrentLocation
 {
-    return [NSString stringWithUTF8String: fInfo->torrent];
+    return [NSString stringWithUTF8String: fInfo->torrent];;
 }
 
@@ -514 +488 @@
 
     fLib = lib;
-    fDefaults = [NSUserDefaults standardUserDefaults];
-
-    fPrivateSaved = [fDefaults boolForKey: @"SavePrivateTorrent"];
 
     int error;
-    if (!path || !(fHandle = tr_torrentInit(fLib, [path UTF8String],
-                    fPrivateSaved ? TR_FSAVEPRIVATE : 0, &error)))
+    if (!path || !(fHandle = tr_torrentInit(fLib, [path UTF8String], &error)))
     {
         [self release];
@@ -526 +496 @@
     }
     
-    return [self initForSuccessWithDate: date stopRatioSetting: stopRatioSetting ratioLimit: ratioLimit];
-}
-
-- (id) initWithHash: (NSString *) hashString lib: (tr_handle_t *) lib date: (NSDate *) date
-        stopRatioSetting: (NSNumber *) stopRatioSetting ratioLimit: (NSNumber *) ratioLimit
-{
-    if (!(self = [super init]))
-        return nil;
-
-    fLib = lib;
+    fInfo = tr_torrentInfo( fHandle );
+    
     fDefaults = [NSUserDefaults standardUserDefaults];
-    
-    fPrivateSaved = YES;
-
-    int error;
-    if (!hashString || !(fHandle = tr_torrentInitSaved(fLib, [hashString UTF8String], TR_FSAVEPRIVATE, &error)))
-    {
-        [self release];
-        return nil;
-    }
-    
-    return [self initForSuccessWithDate: date stopRatioSetting: stopRatioSetting ratioLimit: ratioLimit];
-}
-
-- (id) initForSuccessWithDate: (NSDate *) date stopRatioSetting: (NSNumber *)
-            stopRatioSetting ratioLimit: (NSNumber *) ratioLimit
-{
-    fInfo = tr_torrentInfo( fHandle );
 
     fDate = date ? [date retain] : [[NSDate alloc] init];
@@ -573 +518 @@
     return self;
 }
-
 
 - (void) trashPath: (NSString *) path