Added a dependency on apt7-key to test control.

[cydia.git] / UICaboodle / BrowserView.m

diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m
index b0b04fb225aff5ad04dd7a27d76b32edd27049fc..cb3709c23f4a2837847d6a32eb7385f3b3d3b56a 100644 (file)
--- a/UICaboodle/BrowserView.m
+++ b/UICaboodle/BrowserView.m
@@ -240,7 +240,8 @@
         _assert(dup2(fds[1], 1) != -1);
         _assert(close(fds[0]) != -1);
         _assert(close(fds[1]) != -1);
-        execlp("du", "du", "-s", [path UTF8String], NULL);
+        /* XXX: this should probably not use du */
+        execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL);
         exit(1);
         _assert(false);
     }
@@ -574,8 +575,7 @@
 - (void) webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
     if (![self _allowJavaScriptPanel])
         return;
-
-    // WTR: [self retain];
+    [self retain];
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:nil
@@ -592,6 +592,7 @@
 - (BOOL) webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
     if (![self _allowJavaScriptPanel])
         return NO;
+    [self retain];
 
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:nil
@@ -612,6 +613,8 @@
 
     NSNumber *confirm([confirm_ autorelease]);
     confirm_ = nil;
+
+    [self autorelease];
     return [confirm boolValue];
 }
 
@@ -1005,7 +1008,9 @@
 }
 
 - (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
-    [loading_ addObject:frame];
+    if ([loading_ count] == 0)
+        [self retain];
+    [loading_ addObject:[NSValue valueWithNonretainedObject:frame]];
 
     if ([frame parentFrame] == nil) {
         [webview_ resignFirstResponder];
@@ -1053,8 +1058,10 @@
 
         if ([scroller_ respondsToSelector:@selector(setZoomScale:duration:)])
             [scroller_ setZoomScale:1 duration:0];
-        else
-            [scroller_ setZoomScale:1 animated:NO];
+        else if ([scroller_ respondsToSelector:@selector(_setZoomScale:duration:)])
+            [scroller_ _setZoomScale:1 duration:0];
+        /*else if ([scroller_ respondsToSelector:@selector(setZoomScale:animated:)])
+            [scroller_ setZoomScale:1 animated:NO];*/
 
         CGRect webrect = [scroller_ bounds];
         webrect.size.height = 0;
@@ -1065,7 +1072,10 @@
 }
 
 - (void) _finishLoading {
-    if (reloading_ || [loading_ count] != 0)
+    size_t count([loading_ count]);
+    if (count == 0)
+        [self autorelease];
+    if (reloading_ || count != 0)
         return;
     if (finish_ != nil)
         [self callFunction:finish_];
@@ -1106,8 +1116,7 @@
 }
 
 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
-    [loading_ removeObject:frame];
-
+    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
     [self _finishLoading];
 
     if ([frame parentFrame] == nil) {
@@ -1156,12 +1165,15 @@
 }
 
 - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
-    [loading_ removeObject:frame];
-    if (reloading_)
-        return;
+    if ([frame parentFrame] == nil)
+        [self autorelease];
 
+    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
     [self _finishLoading];
 
+    if (reloading_)
+        return;
+
     if ([frame parentFrame] == nil) {
         [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
             [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],