Rewrite error handling in APT to make it saner :/.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index a7ff586f3691bfa43db5169ff80180e7808b39d9..83c8e91edc63190142371602d31fd5d70c0cae65 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -8,7 +8,7 @@
 #include "CyteKit/IndirectDelegate.h"
 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/IndirectDelegate.h"
 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"

-#include "CyteKit/PerlCompatibleRegEx.hpp"
+#include "CyteKit/RegEx.hpp"

 #include "CyteKit/WebThreadLocked.hpp"
 
 //#include <QuartzCore/CALayer.h>
 #include "CyteKit/WebThreadLocked.hpp"
 
 //#include <QuartzCore/CALayer.h>


@@ -95,7 +95,7 @@ float CYScrollViewDecelerationRateNormal;
     // XXX: WebThreadCreateNSInvocation returns nil
 
 #if ShowInternals
     // XXX: WebThreadCreateNSInvocation returns nil
 
 #if ShowInternals

-    fprintf(stderr, "[%s]R?%s\n", class_getName(self->isa), sel_getName(sel));
+    fprintf(stderr, "[%s]R?%s\n", class_getName(object_getClass(self)), sel_getName(sel));

 #endif
 
     return delegate_ == nil ? NO : [delegate_ respondsToSelector:sel];
 #endif
 
     return delegate_ == nil ? NO : [delegate_ respondsToSelector:sel];


@@ -106,7 +106,7 @@ float CYScrollViewDecelerationRateNormal;
         return method;
 
 #if ShowInternals
         return method;
 
 #if ShowInternals

-    fprintf(stderr, "[%s]S?%s\n", class_getName(self->isa), sel_getName(sel));
+    fprintf(stderr, "[%s]S?%s\n", class_getName(object_getClass(self)), sel_getName(sel));

 #endif
 
     if (delegate_ != nil)
 #endif
 
     if (delegate_ != nil)


@@ -443,10 +443,10 @@ float CYScrollViewDecelerationRateNormal;
 // CyteWebViewDelegate {{{
 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
 #if LogMessages
 // CyteWebViewDelegate {{{
 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
 #if LogMessages

-    static Pcre irritating("^(?"
+    static RegEx irritating("(?"

         ":" "The page at .* displayed insecure content from .*\\."
         "|" "Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\."
         ":" "The page at .* displayed insecure content from .*\\."
         "|" "Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\."

-    ")\\n$");
+    ")\\n");

 
     if (NSString *data = [message objectForKey:@"message"])
         if (irritating(data))
 
     if (NSString *data = [message objectForKey:@"message"])
         if (irritating(data))


@@ -505,7 +505,7 @@ float CYScrollViewDecelerationRateNormal;
 
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
 #if LogBrowser
 
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
 #if LogBrowser

-    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
+    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ %@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);

 #endif
 
     if ([frame parentFrame] == nil) {
 #endif
 
     if ([frame parentFrame] == nil) {