We are no longer recycling package controllers.

[cydia.git] / UICaboodle / BrowserView.mm

diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index f1053f85e65f5c5fa76185f6c4900ca510adb104..2abc02ecc607b3c968bbf2c656260fb490b10b70 100644 (file)
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -638,7 +638,7 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
     if ([scheme isEqualToString:@"mailto"])
         [self _openMailToURL:url];
 
     if ([scheme isEqualToString:@"mailto"])
         [self _openMailToURL:url];
 

-    CYViewController *page([delegate_ pageForURL:url hasTag:NULL]);
+    CYViewController *page([delegate_ pageForURL:url]);

 
     if (page == nil) {
         BrowserController *browser([[[class_ alloc] init] autorelease]);
 
     if (page == nil) {
         BrowserController *browser([[[class_ alloc] init] autorelease]);


@@ -653,13 +653,11 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
 
         [[self navigationController] pushViewController:page animated:YES];
     } else {
 
         [[self navigationController] pushViewController:page animated:YES];
     } else {

-        UCNavigationController *navigation([[[UCNavigationController alloc] init] autorelease]);
+        UCNavigationController *navigation([[[UCNavigationController alloc] initWithRootViewController:page] autorelease]);

 
         [navigation setHook:indirect_];
         [navigation setDelegate:delegate_];
 
 
         [navigation setHook:indirect_];
         [navigation setDelegate:delegate_];
 

-        [navigation setViewControllers:[NSArray arrayWithObject:page]];
-

         [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
             initWithTitle:UCLocalize("CLOSE")
             style:UIBarButtonItemStylePlain
         [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
             initWithTitle:UCLocalize("CLOSE")
             style:UIBarButtonItemStylePlain


@@ -837,19 +835,13 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"submit"]) {
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"submit"]) {

-        switch (button) {
-            case 1:
-            break;
-
-            case 2:
-                if (request_ != nil) {
-                    WebThreadLock();
-                    [webview_ loadRequest:request_];
-                    WebThreadUnlock();
-                }
-            break;
-
-            _nodefault
+        if (button == [alert cancelButtonIndex]) {
+        } else if (button == [alert firstOtherButtonIndex]) {
+            if (request_ != nil) {
+                WebThreadLock();
+                [webview_ loadRequest:request_];
+                WebThreadUnlock();
+            }

         }
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
         }
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];


@@ -904,24 +896,33 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
     }
 }
 
     }
 }
 

+- (void) didStartLoading {
+    // Overridden in subclasses.
+}
+

 - (void) _didStartLoading {
     [self applyRightButton];
 
     if ([loading_ count] != 1)
         return;
 - (void) _didStartLoading {
     [self applyRightButton];
 
     if ([loading_ count] != 1)
         return;

+

     [delegate_ retainNetworkActivityIndicator];
     [delegate_ retainNetworkActivityIndicator];

+    [self didStartLoading];
+}
+
+- (void) didFinishLoading {
+    // Overridden in subclasses.

 }
 
 - (void) _didFinishLoading {
     if ([loading_ count] != 0)
         return;
 }
 
 - (void) _didFinishLoading {
     if ([loading_ count] != 0)
         return;

-    [delegate_ releaseNetworkActivityIndicator];

 
     [self applyRightButton];
 
     [self applyRightButton];

+    [[self navigationItem] setTitle:title_];

 
 

-    // XXX: wtf?
-    if (![self isLoading])
-        [[self navigationItem] setTitle:title_];
+    [delegate_ releaseNetworkActivityIndicator];
+    [self didFinishLoading];

 }
 
 - (bool) isLoading {
 }
 
 - (bool) isLoading {