minor changes

PatchedFile.h

@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#define LOG_SELF NSLog(@"%@ %s", self, _cmd)
+#define LOG_SELF  NSLog(@"%@ %@", self, NSStringFromSelector(_cmd))
 #ifndef LocationLog
 #define LocationLog(format,...) \
 { \

main.m

@@ -18,11 +18,10 @@
 
 int main(int argc, char *argv[])
 {
-
-
-
 	//FIXME: COMMENT BACK IN BEFORE RELEASE!!!!
 
+    /*
+    
 	 id pool = [NSAutoreleasePool new];
 
 	
@@ -31,7 +30,7 @@ int main(int argc, char *argv[])
 
 	 [pool release];
 
-
+	*/
 	return NSApplicationMain(argc,  (const char **) argv);
 }
 

tetherKitAppDelegate.m

@@ -2618,14 +2618,6 @@ - (NSString *)restoreStatusForOperation:(int)opValue
 
 - (void)newRestoreIPSW:(NSString *)ipswPath
 {
-
-//    if (self.theEcid == nil)
-//    {
-//        [self _fetchDeviceInfo];
-//        sleep(5);
-//    }
-
-
     LOG_SELF;
     NSLog(@"ipswPath: %@", ipswPath);
 
@@ -2662,6 +2654,7 @@ - (void)newRestoreIPSW:(NSString *)ipswPath
         assert(!returnVal);
         if (threadError != 0)
         {
+            NSLog(@"theres an error!");
             // Report an error.
         }
 
@@ -2717,36 +2710,7 @@ - (void)newRestoreIPSW:(NSString *)ipswPath
     {
        // NSString *ipswPath = [NSHomeDirectory() stringByAppendingPathComponent:@"Desktop/AppleTV2,1_5.3_10B809_SP_Restore"];
 
-        //its a zip file, need to extract it first!!
 
-        //should be able to prune this out
-
-
-        if ([ipswPath.pathExtension isEqualToString:@"ipsw"])
-        {
-            NSLog(@"need to unzip!");
-            NSString *extractedPath = [ipswPath stringByDeletingPathExtension];
-
-            [self setDownloadText:NSLocalizedString(@"Unzipping IPSW...",@"Unzipping IPSW..." )];
-            if ([nitoUtility unzipFile:ipswPath toPath:extractedPath])
-            {
-                ipswPath = extractedPath;
-
-            } else {
-
-                [self setDownloadText:NSLocalizedString(@"Firmware restore failed", @"Firmware restore failed")];
-
-                // [instructionImage setImage:[self imageForMode:kSPSuccessImage]];
-                [self hideProgress];
-
-                self.restoreStatus = FALSE;
-                close_libusbkit(Device);
-                return;
-
-
-            }
-
-        }
 
         IPSW *theFw = [[IPSW alloc] initWithPath:ipswPath];
 
@@ -2771,7 +2735,6 @@ - (void)newRestoreIPSW:(NSString *)ipswPath
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(restoreProgress:) name:@"RestoreProgress" object:nil];
 
     }
-    //[pool release];
 }