Fix various forms of icon escape encoding.

[cydia.git] / CyteKit / WebView.mm

diff --git a/CyteKit/WebView.mm b/CyteKit/WebView.mm
index 8fd362f6c40eb46da8cb051bbeb1baae0e7f0607..608e9e2964036d3750a7b2abf16178207c87578d 100644 (file)
--- a/CyteKit/WebView.mm
+++ b/CyteKit/WebView.mm
@@ -45,13 +45,6 @@
 #include "iPhonePrivate.h"
 
 // CYWebPolicyDecision* {{{
-enum CYWebPolicyDecision {
-    CYWebPolicyDecisionUnknown,
-    CYWebPolicyDecisionDownload,
-    CYWebPolicyDecisionIgnore,
-    CYWebPolicyDecisionUse,
-};
-
 @interface CYWebPolicyDecisionMediator : NSObject <
     WebPolicyDecisionListener
 > {
@@ -165,6 +158,7 @@ static void $UIWebViewWebViewDelegate$webView$addMessageToConsole$(UIWebViewWebV
         [delegate webView:view decidePolicyForNavigationAction:action request:request frame:frame decisionListener:mediator];
     if (![mediator decided] && [UIWebView instancesRespondToSelector:@selector(webView:decidePolicyForNavigationAction:request:frame:decisionListener:)])
         [super webView:view decidePolicyForNavigationAction:action request:request frame:frame decisionListener:mediator];
+    [delegate webView:view didDecidePolicy:[mediator decision] forNavigationAction:action request:request frame:frame];
     [mediator decide];
 }
 // }}}
@@ -270,6 +264,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$
 // }}}
 // webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame: (2.1+) {{{
 - (void) webView:(WebView *)view runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
+    [[self retain] autorelease];
     id<CyteWebViewDelegate> delegate([self delegate]);
     if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:)])
         if (
@@ -281,6 +276,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$
 // }}}
 // webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame: (2.1+) {{{
 - (BOOL) webView:(WebView *)view runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
+    [[self retain] autorelease];
     id<CyteWebViewDelegate> delegate([self delegate]);
     if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:)])
         if (
@@ -293,6 +289,7 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$
 // }}}
 // webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame: (2.1+) {{{
 - (NSString *) webView:(WebView *)view runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)text initiatedByFrame:(WebFrame *)frame {
+    [[self retain] autorelease];
     id<CyteWebViewDelegate> delegate([self delegate]);
     if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:)])
         if (