Provide more guarantees against merge catastrophe.

[cydia.git] / CyteKit / WebViewController.h

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index 96186c1697f8b09a22d75efcdbe8bb4fdbb2f5a5..c8630d90e1e2ba5d993740edcf1ef0106fe49ad0 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -1,5 +1,5 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
 /* Cydia - iPhone UIKit Front-End for Debian APT

- * Copyright (C) 2008-2014  Jay Freeman (saurik)
+ * Copyright (C) 2008-2015  Jay Freeman (saurik)

 */
 
 /* GNU General Public License, Version 3 {{{ */
 */
 
 /* GNU General Public License, Version 3 {{{ */


@@ -56,6 +56,7 @@
     bool ready_;
 
     _transient NSNumber *sensitive_;
     bool ready_;
 
     _transient NSNumber *sensitive_;

+    _H<NSURL> appstore_;

 
     _H<NSString> title_;
     _H<NSMutableSet> loading_;
 
     _H<NSString> title_;
     _H<NSMutableSet> loading_;


@@ -106,7 +107,9 @@
 - (void) reloadURLWithCache:(BOOL)cache;
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
 - (void) reloadURLWithCache:(BOOL)cache;
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;

+

 - (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;
 - (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;

+- (NSURLRequest *) webThreadWebView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;

 
 + (float) defaultWidth;
 
 
 + (float) defaultWidth;