Ignore .dSYM folders I am suddenly ending up with.

[cydia.git] / CyteKit / ViewController.mm

diff --git a/CyteKit/ViewController.mm b/CyteKit/ViewController.mm
index 78f2b264cb202247c84b3120f39aba61e22ef5ef..41e7ea9a5c53704c9cc3b100d98a6f8b492d5fd8 100644 (file)
--- a/CyteKit/ViewController.mm
+++ b/CyteKit/ViewController.mm
@@ -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 {{{ */


@@ -19,12 +19,15 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "CyteKit/ViewController.h"
+#include "CyteKit/UCPlatform.h"

 
 #include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
 
 
 #include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
 

+#include "CyteKit/ViewController.h"
+

 #include "iPhonePrivate.h"
 #include "iPhonePrivate.h"

+#include <Menes/ObjectHandle.h>

 
 @implementation UIViewController (Cydia)
 
 
 @implementation UIViewController (Cydia)
 


@@ -49,9 +52,24 @@
     return nil;
 }
 
     return nil;
 }
 

+- (UIViewController *) rootViewController {
+    UIViewController *base(self);
+    while ([base parentOrPresentingViewController] != nil)
+        base = [base parentOrPresentingViewController];
+    return base;
+}
+
+- (NSURL *) navigationURL {
+    return nil;
+}
+

 @end
 
 @end
 

-@implementation CyteViewController
+@implementation CyteViewController {
+    _transient id delegate_;
+    BOOL loaded_;
+    _H<UIColor> color_;
+}

 
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;


@@ -102,16 +120,16 @@
     [super unloadData];
 }
 
     [super unloadData];
 }
 

-- (NSURL *) navigationURL {
-    return nil;
-}
-

 - (void) setPageColor:(UIColor *)color {
     if (color == nil)
         color = [UIColor groupTableViewBackgroundColor];
     color_ = color;
 }
 
 - (void) setPageColor:(UIColor *)color {
     if (color == nil)
         color = [UIColor groupTableViewBackgroundColor];
     color_ = color;
 }
 

+- (UIColor *) pageColor {
+    return color_;
+}
+

 #include "InterfaceOrientation.h"
 
 @end
 #include "InterfaceOrientation.h"
 
 @end