Fix the type of the ellipsis: argument.

[cydia.git] / Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index eb17d6a13ceed4f7565099b47dd606f64da0a6c7..efbb9b83afb866794315bc7123d6dca5a1e2d096 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -41,14 +41,13 @@
 #define USE_SYSTEM_MALLOC 1
 
 /* #include Directives {{{ */
 #define USE_SYSTEM_MALLOC 1
 
 /* #include Directives {{{ */

-#import "UICaboodle/UCPlatform.h"
-#import "UICaboodle/UCLocalize.h"
+#include "UICaboodle/UCPlatform.h"
+#include "UICaboodle/UCLocalize.h"

 
 #include <objc/objc.h>
 #include <objc/runtime.h>
 
 #include <CoreGraphics/CoreGraphics.h>
 
 #include <objc/objc.h>
 #include <objc/runtime.h>
 
 #include <CoreGraphics/CoreGraphics.h>

-#include <GraphicsServices/GraphicsServices.h>

 #include <Foundation/Foundation.h>
 
 #if 0
 #include <Foundation/Foundation.h>
 
 #if 0


@@ -60,10 +59,12 @@
 #include <CoreFoundation/CFPriv.h>
 #include <CoreFoundation/CFUniChar.h>
 
 #include <CoreFoundation/CFPriv.h>
 #include <CoreFoundation/CFUniChar.h>
 

-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
+#include "iPhonePrivate.h"
+
+#include <IOKit/IOKitLib.h>

 
 #include <WebCore/WebCoreThread.h>
 
 #include <WebCore/WebCoreThread.h>

-#import <WebKit/WebDefaultUIKitDelegate.h>

 
 #include <algorithm>
 #include <iomanip>
 
 #include <algorithm>
 #include <iomanip>


@@ -100,6 +101,7 @@
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <sys/param.h>
 #include <sys/mount.h>
 

+#include <fcntl.h>

 #include <notify.h>
 #include <dlfcn.h>
 
 #include <notify.h>
 #include <dlfcn.h>
 


@@ -116,55 +118,13 @@ extern "C" {
 
 #include <ext/hash_map>
 
 
 #include <ext/hash_map>
 

-#include <notify.h>
-
-#import "UICaboodle/BrowserView.h"
-#import "UICaboodle/ResetView.h"
+#include "UICaboodle/BrowserView.h"
+#include "UICaboodle/ResetView.h"

 
 

-#import "substrate.h"
+#include "substrate.h"

 
 // Apple's sample Reachability code, ASPL licensed.
 
 // Apple's sample Reachability code, ASPL licensed.

-#import "Reachability.h"
-/* }}} */
-
-/* Header Fixes and Updates {{{ */
-typedef enum {
-   UIModalPresentationFullScreen = 0,
-   UIModalPresentationPageSheet,
-   UIModalPresentationFormSheet,
-   UIModalPresentationCurrentContext,
-} UIModalPresentationStyle;
-
-@interface UIAlertView (Private)
-- (void)setNumberOfRows:(int)rows;
-- (void)setContext:(id)context;
-- (id)context;
-@end
-
-@interface UIViewController (UIKit)
-- (id)navigationItem;
-- (id)navigationController;
-- (id)tabBarItem;
-@end
-
-@interface UITabBarController : UIViewController {
-    id _tabBar;
-    id _containerView;
-    id _viewControllerTransitionView;
-    id _viewControllers;
-    id _tabBarItemsToViewControllers;
-    id _selectedViewController;
-    id _moreNavigationController;
-    id _customizableViewControllers;
-    id _delegate;
-    id _selectedViewControllerDuringWillAppear;
-    id _transientViewController;
-    unsigned int isShowingMoreItem:1;
-    unsigned int needsToRebuildItems:1;
-    unsigned int isBarHidden:1;
-    unsigned int editButtonOnLeft:1;
-}
-@end
+#include "Reachability.h"

 /* }}} */
 
 /* Profiler {{{ */
 /* }}} */
 
 /* Profiler {{{ */


@@ -686,10 +646,6 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s
     return length;
 }
 
     return length;
 }
 

-@interface NSString (UIKit)
-- (NSString *) stringByAddingPercentEscapes;
-@end
-

 /* Cydia NSString Additions {{{ */
 @interface NSString (Cydia)
 + (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length;
 /* Cydia NSString Additions {{{ */
 @interface NSString (Cydia)
 + (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length;


@@ -1250,13 +1206,15 @@ bool isSectionVisible(NSString *section) {
 - (void) installPackage:(Package *)package;
 - (void) installPackages:(NSArray *)packages;
 - (void) removePackage:(Package *)package;
 - (void) installPackage:(Package *)package;
 - (void) installPackages:(NSArray *)packages;
 - (void) removePackage:(Package *)package;

+- (void) beginUpdate;
+- (BOOL) updating;

 - (void) distUpgrade;
 - (void) updateData;
 - (void) syncData;
 - (void) showSettings;
 - (UIProgressHUD *) addProgressHUD;
 - (void) removeProgressHUD:(UIProgressHUD *)hud;
 - (void) distUpgrade;
 - (void) updateData;
 - (void) syncData;
 - (void) showSettings;
 - (UIProgressHUD *) addProgressHUD;
 - (void) removeProgressHUD:(UIProgressHUD *)hud;

-- (UIViewController *) pageForPackage:(NSString *)name;
+- (UCViewController *) pageForPackage:(NSString *)name;

 - (PackageController *) packageController;
 @end
 /* }}} */
 - (PackageController *) packageController;
 @end
 /* }}} */


@@ -1448,7 +1406,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 @end
 /* }}} */
 /* Delegate Helpers {{{ */
 @end
 /* }}} */
 /* Delegate Helpers {{{ */

-@implementation NSObject(ProgressDelegate)
+@implementation NSObject (ProgressDelegate)

 
 - (void) _setProgressErrorPackage:(NSArray *)args {
     [self performSelector:@selector(setProgressError:forPackage:)
 
 - (void) _setProgressErrorPackage:(NSArray *)args {
     [self performSelector:@selector(setProgressError:forPackage:)


@@ -1474,7 +1432,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
     Package *package = id == nil ? nil : [[Database sharedInstance] packageWithName:id];
     // XXX: holy typecast batman!
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
     Package *package = id == nil ? nil : [[Database sharedInstance] packageWithName:id];
     // XXX: holy typecast batman!

-    [self setProgressError:error withTitle:(package == nil ? id : [package name])];
+    [(id<ProgressDelegate>)self setProgressError:error withTitle:(package == nil ? id : [package name])];

 }
 
 @end
 }
 
 @end


@@ -3975,7 +3933,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (id) init {
 }
 
 - (id) init {

-    if ((self = [super initWithWidth:[[self view] bounds].size.width ofClass:[CYBrowserController class]]) != nil) {
+    if ((self = [super initWithWidth:0 ofClass:[CYBrowserController class]]) != nil) {

         cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_];
 
         WebView *webview([document_ webView]);
         cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_];
 
         WebView *webview([document_ webView]);


@@ -4292,7 +4250,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [database_ setDelegate:self];
         delegate_ = delegate;
 
         [database_ setDelegate:self];
         delegate_ = delegate;
 

-        [[self view] setBackgroundColor:(CGColor *)[UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:1.0f]];
+        [[self view] setBackgroundColor:[UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:1.0f]];

 
         progress_ = [[UIProgressBar alloc] init];
         [progress_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)];
 
         progress_ = [[UIProgressBar alloc] init];
         [progress_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin)];


@@ -4366,7 +4324,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) viewWillAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     [[self navigationItem] setHidesBackButton:YES];
 - (void) viewWillAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     [[self navigationItem] setHidesBackButton:YES];

-    [[[self navigationController] navigationBar] setBarStyle:1];
+    [[[self navigationController] navigationBar] setBarStyle:UIBarStyleBlack];

     
     [self positionViews];
 }
     
     [self positionViews];
 }


@@ -4649,8 +4607,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* }}} */
 
 /* Cell Content View {{{ */
 /* }}} */
 
 /* Cell Content View {{{ */

+@protocol ContentDelegate
+- (void) drawContentRect:(CGRect)rect;
+@end
+

 @interface ContentView : UIView {
 @interface ContentView : UIView {

-    _transient id delegate_;
+    _transient id<ContentDelegate> delegate_;

 }
 
 @end
 }
 
 @end


@@ -4663,7 +4625,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } return self;
 }
 
     } return self;
 }
 

-- (void) setDelegate:(id)delegate {
+- (void) setDelegate:(id<ContentDelegate>)delegate {

     delegate_ = delegate;
 }
 
     delegate_ = delegate;
 }
 


@@ -4674,7 +4636,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Package Cell {{{ */
 @end
 /* }}} */
 /* Package Cell {{{ */

-@interface PackageCell : UITableViewCell {
+@interface PackageCell : UITableViewCell <
+    ContentDelegate
+> {

     UIImage *icon_;
     NSString *name_;
     NSString *description_;
     UIImage *icon_;
     NSString *name_;
     NSString *description_;


@@ -4889,7 +4853,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Section Cell {{{ */
 @end
 /* }}} */
 /* Section Cell {{{ */

-@interface SectionCell : UITableViewCell {
+@interface SectionCell : UITableViewCell <
+    ContentDelegate
+> {

     NSString *basic_;
     NSString *section_;
     NSString *name_;
     NSString *basic_;
     NSString *section_;
     NSString *name_;


@@ -4900,7 +4866,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     BOOL editing_;
 }
 
     BOOL editing_;
 }
 

-- (id) init;

 - (void) setSection:(Section *)section editing:(BOOL)editing;
 
 @end
 - (void) setSection:(Section *)section editing:(BOOL)editing;
 
 @end


@@ -4997,7 +4962,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             [switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO];
     }
 
             [switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO];
     }
 

-    [self setAccessoryType:editing ? 0 : 1 /*UITableViewCellAccessoryDisclosureIndicator*/];
+    [self setAccessoryType:editing ? UITableViewCellAccessoryNone : UITableViewCellAccessoryDisclosureIndicator];

     [content_ setNeedsDisplay];
 }
 
     [content_ setNeedsDisplay];
 }
 


@@ -5036,7 +5001,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* }}} */
 
 /* File Table {{{ */
 /* }}} */
 
 /* File Table {{{ */

-@interface FileTable : CYViewController {
+@interface FileTable : CYViewController <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     Package *package_;
     NSString *name_;
     _transient Database *database_;
     Package *package_;
     NSString *name_;


@@ -5078,7 +5046,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [cell setFont:[UIFont systemFontOfSize:16]];
     }
     [cell setText:[files_ objectAtIndex:indexPath.row]];
         [cell setFont:[UIFont systemFontOfSize:16]];
     }
     [cell setText:[files_ objectAtIndex:indexPath.row]];

-    [cell setSelectionStyle:0 /*UITableViewCellSelectionStyleNone*/];
+    [cell setSelectionStyle:UITableViewCellSelectionStyleNone];

 
     return cell;
 }
 
     return cell;
 }


@@ -5208,8 +5176,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         }
         
         [sheet dismissWithClickedButtonIndex:-1 animated:YES];
         }
         
         [sheet dismissWithClickedButtonIndex:-1 animated:YES];

-    } else {
-        [super alertSheet:sheet clickedButtonAtIndex:button];

     }
 }
 
     }
 }
 


@@ -5361,7 +5327,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Package Table {{{ */
 @end
 /* }}} */
 /* Package Table {{{ */

-@interface PackageTable : UIView {
+@interface PackageTable : UIView <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;
     _transient Database *database_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;


@@ -5425,7 +5394,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
 }
 
 - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {

-    PackageCell *cell([table dequeueReusableCellWithIdentifier:@"Package"]);
+    PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);

     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];
     [cell setPackage:[self packageAtIndexPath:path]];
     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];
     [cell setPackage:[self packageAtIndexPath:path]];


@@ -5699,7 +5668,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Source Cell {{{ */
 @end
 /* }}} */
 /* Source Cell {{{ */

-@interface SourceCell : UITableViewCell {
+@interface SourceCell : UITableViewCell <
+    ContentDelegate
+> {

     UIImage *icon_;
     NSString *origin_;
     NSString *description_;
     UIImage *icon_;
     NSString *origin_;
     NSString *description_;


@@ -5793,7 +5764,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Source Table {{{ */
 @end
 /* }}} */
 /* Source Table {{{ */

-@interface SourceTable : CYViewController {
+@interface SourceTable : CYViewController <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     UITableView *list_;
     NSMutableArray *sources_;
     _transient Database *database_;
     UITableView *list_;
     NSMutableArray *sources_;


@@ -5814,6 +5788,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (id) initWithDatabase:(Database *)database;
 
 
 - (id) initWithDatabase:(Database *)database;
 

+- (void) updateButtonsForEditingStatus:(BOOL)editing animated:(BOOL)animated;
+

 @end
 
 @implementation SourceTable
 @end
 
 @implementation SourceTable


@@ -5899,8 +5875,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return cell;
 }
 
     return cell;
 }
 

-- (int) tableView:(UITableView *)tableView accessoryTypeForRowWithIndexPath:(NSIndexPath *)indexPath {
-    return 1; //UITableViewCellAccessoryDisclosureIndicator?
+- (UITableViewCellAccessoryType) tableView:(UITableView *)tableView accessoryTypeForRowWithIndexPath:(NSIndexPath *)indexPath {
+    return UITableViewCellAccessoryDisclosureIndicator;

 }
 
 - (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
 }
 
 - (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {


@@ -6255,6 +6231,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (id) initWithDatabase:(Database *)database;
 
 
 - (id) initWithDatabase:(Database *)database;
 

+- (void) updateRoleButton;
+- (void) queueStatusDidChange;
+

 @end
 
 @implementation InstalledController
 @end
 
 @implementation InstalledController


@@ -6386,6 +6365,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @interface ManageController : CYBrowserController {
 }
 
 @interface ManageController : CYBrowserController {
 }
 

+- (void) queueStatusDidChange;

 @end
 
 @implementation ManageController
 @end
 
 @implementation ManageController


@@ -6499,10 +6479,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
 
         [self setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]];
         [self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
 
         [self setTintColor:[UIColor colorWithRed:0.23 green:0.23 blue:0.23 alpha:1]];

-        [self setBarStyle:1];
+        [self setBarStyle:UIBarStyleBlack];

 
 

-        int barstyle([self _barStyle:NO]);
-        bool ugly(barstyle == 0);
+        UIBarStyle barstyle([self _barStyle:NO]);
+        bool ugly(barstyle == UIBarStyleDefault);

 
         UIProgressIndicatorStyle style = ugly ?
             UIProgressIndicatorStyleMediumBrown :
 
         UIProgressIndicatorStyle style = ugly ?
             UIProgressIndicatorStyleMediumBrown :


@@ -6558,6 +6538,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 
 @end
 /* }}} */
 

+@class CYNavigationController;
+

 /* Cydia Tab Bar Controller {{{ */
 @interface CYTabBarController : UITabBarController {
     Database *database_;
 /* Cydia Tab Bar Controller {{{ */
 @interface CYTabBarController : UITabBarController {
     Database *database_;


@@ -6573,7 +6555,7 @@ freeing the view controllers on tab change */
 - (void) reloadData {
     size_t count([[self viewControllers] count]);
     for (size_t i(0); i != count; ++i) {
 - (void) reloadData {
     size_t count([[self viewControllers] count]);
     for (size_t i(0); i != count; ++i) {

-        UIViewController *page([[self viewControllers] objectAtIndex:(count - i - 1)]);
+        CYNavigationController *page([[self viewControllers] objectAtIndex:(count - i - 1)]);

         [page reloadData];
     }
 }
         [page reloadData];
     }
 }


@@ -6588,9 +6570,7 @@ freeing the view controllers on tab change */
 /* }}} */
 
 /* Cydia Navigation Controller {{{ */
 /* }}} */
 
 /* Cydia Navigation Controller {{{ */

-@interface CYNavigationController : UINavigationController <
-    ProgressDelegate
-> {
+@interface CYNavigationController : UINavigationController {

     _transient Database *database_;
     id delegate_;
 }
     _transient Database *database_;
     id delegate_;
 }


@@ -6619,7 +6599,7 @@ freeing the view controllers on tab change */
 - (void) reloadData {
     size_t count([[self viewControllers] count]);
     for (size_t i(0); i != count; ++i) {
 - (void) reloadData {
     size_t count([[self viewControllers] count]);
     for (size_t i(0); i != count; ++i) {

-        UIViewController *page([[self viewControllers] objectAtIndex:(count - i - 1)]);
+        CYViewController *page([[self viewControllers] objectAtIndex:(count - i - 1)]);

         [page reloadData];
     }
 }
         [page reloadData];
     }
 }


@@ -6738,7 +6718,10 @@ freeing the view controllers on tab change */
 /* }}} */
 
 /* Sections Controller {{{ */
 /* }}} */
 
 /* Sections Controller {{{ */

-@interface SectionsController : CYViewController {
+@interface SectionsController : CYViewController <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     NSMutableArray *sections_;
     NSMutableArray *filtered_;
     _transient Database *database_;
     NSMutableArray *sections_;
     NSMutableArray *filtered_;


@@ -6751,6 +6734,8 @@ freeing the view controllers on tab change */
 - (void) reloadData;
 - (void) resetView;
 
 - (void) reloadData;
 - (void) resetView;
 

+- (void) editButtonClicked;
+

 @end
 
 @implementation SectionsController
 @end
 
 @implementation SectionsController


@@ -6967,7 +6952,10 @@ freeing the view controllers on tab change */
 @end
 /* }}} */
 /* Changes Controller {{{ */
 @end
 /* }}} */
 /* Changes Controller {{{ */

-@interface ChangesController : CYViewController {
+@interface ChangesController : CYViewController <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;
     _transient Database *database_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;


@@ -7027,7 +7015,7 @@ freeing the view controllers on tab change */
 }
 
 - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
 }
 
 - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {

-    PackageCell *cell([table dequeueReusableCellWithIdentifier:@"Package"]);
+    PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);

     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];
     [cell setPackage:[self packageAtIndexPath:path]];
     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];
     [cell setPackage:[self packageAtIndexPath:path]];


@@ -7048,7 +7036,7 @@ freeing the view controllers on tab change */
 }
 
 - (void) refreshButtonClicked {
 }
 
 - (void) refreshButtonClicked {

-    [[UIApplication sharedApplication] beginUpdate];
+    [delegate_ beginUpdate];

     [[self navigationItem] setLeftBarButtonItem:nil];
 }
 
     [[self navigationItem] setLeftBarButtonItem:nil];
 }
 


@@ -7187,15 +7175,17 @@ freeing the view controllers on tab change */
         target:self
         action:@selector(refreshButtonClicked)
     ];
         target:self
         action:@selector(refreshButtonClicked)
     ];

-    if (![[UIApplication sharedApplication] updating]) [[self navigationItem] setLeftBarButtonItem:leftItem];
+    if (![delegate_ updating]) [[self navigationItem] setLeftBarButtonItem:leftItem];

     [leftItem release];
 }
 
 @end
 /* }}} */
 /* Search Controller {{{ */
     [leftItem release];
 }
 
 @end
 /* }}} */
 /* Search Controller {{{ */

-@interface SearchController : FilteredPackageController {
-    id search_;
+@interface SearchController : FilteredPackageController <
+    UISearchBarDelegate
+> {
+    UISearchBar *search_;

 }
 
 - (id) initWithDatabase:(Database *)database;
 }
 
 - (id) initWithDatabase:(Database *)database;


@@ -7230,7 +7220,7 @@ freeing the view controllers on tab change */
 - (void)viewDidAppear:(BOOL)animated {
        [super viewDidAppear:animated];
        if (!search_) {
 - (void)viewDidAppear:(BOOL)animated {
        [super viewDidAppear:animated];
        if (!search_) {

-        search_ = [[objc_getClass("UISearchBar") alloc] initWithFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)];
+        search_ = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)];

         [search_ layoutSubviews];
         [search_ setPlaceholder:UCLocalize("SEARCH_EX")];
         UITextField *textField = [search_ searchField];
         [search_ layoutSubviews];
         [search_ setPlaceholder:UCLocalize("SEARCH_EX")];
         UITextField *textField = [search_ searchField];


@@ -7260,15 +7250,18 @@ freeing the view controllers on tab change */
 @end
 /* }}} */
 /* Settings Controller {{{ */
 @end
 /* }}} */
 /* Settings Controller {{{ */

-@interface SettingsController : CYViewController {
+@interface SettingsController : CYViewController <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     NSString *name_;
     Package *package_;
     _transient Database *database_;
     NSString *name_;
     Package *package_;

-    UIPreferencesTable *table_;
-    _UISwitchSlider *subscribedSwitch_;
-    _UISwitchSlider *ignoredSwitch_;
-    UIPreferencesControlTableCell *subscribedCell_;
-    UIPreferencesControlTableCell *ignoredCell_;
+    UITableView *table_;
+    id subscribedSwitch_;
+    id ignoredSwitch_;
+    UITableViewCell *subscribedCell_;
+    UITableViewCell *ignoredCell_;

 }
 
 - (id) initWithDatabase:(Database *)database package:(NSString *)package;
 }
 
 - (id) initWithDatabase:(Database *)database package:(NSString *)package;


@@ -7278,8 +7271,6 @@ freeing the view controllers on tab change */
 @implementation SettingsController
 
 - (void) dealloc {
 @implementation SettingsController
 
 - (void) dealloc {

-    [table_ setDataSource:nil];
-

     [name_ release];
     if (package_ != nil)
         [package_ release];
     [name_ release];
     if (package_ != nil)
         [package_ release];


@@ -7288,64 +7279,32 @@ freeing the view controllers on tab change */
     [ignoredSwitch_ release];
     [subscribedCell_ release];
     [ignoredCell_ release];
     [ignoredSwitch_ release];
     [subscribedCell_ release];
     [ignoredCell_ release];

+    

     [super dealloc];
 }
 
     [super dealloc];
 }
 

-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {

     if (package_ == nil)
         return 0;
 
     if (package_ == nil)
         return 0;
 

-    return 2;
+    return 1;

 }
 
 }
 

-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    if (package_ == nil)
-        return nil;
-
-    switch (group) {
-        case 0: return nil;
-        case 1: return nil;
-
-        _nodefault
-    }
-
-    return nil;
-}
-
-- (BOOL) preferencesTable:(UIPreferencesTable *)table isLabelGroup:(int)group {
-    if (package_ == nil)
-        return NO;
-
-    switch (group) {
-        case 0: return NO;
-        case 1: return YES;
-
-        _nodefault
-    }
-
-    return NO;
-}
-
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {

     if (package_ == nil)
         return 0;
 
     if (package_ == nil)
         return 0;
 

-    switch (group) {
-        case 0: return 1;
-        case 1: return 1;
-
-        _nodefault
-    }
+    return 1;
+}

 
 

-    return 0;
+- (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {
+    return UCLocalize("SHOW_ALL_CHANGES_EX");

 }
 
 }
 

-- (void) onSomething:(UIPreferencesControlTableCell *)cell withKey:(NSString *)key {
+- (void) onSomething:(BOOL)value withKey:(NSString *)key {

     if (package_ == nil)
         return;
 
     if (package_ == nil)
         return;
 

-    _UISwitchSlider *slider([cell control]);
-    BOOL value([slider value] != 0);

     NSMutableDictionary *metadata([package_ metadata]);
 
     BOOL before;
     NSMutableDictionary *metadata([package_ metadata]);
 
     BOOL before;


@@ -7361,38 +7320,22 @@ freeing the view controllers on tab change */
     }
 }
 
     }
 }
 

-- (void) onSubscribed:(UIPreferencesControlTableCell *)cell {
-    [self onSomething:cell withKey:@"IsSubscribed"];
+- (void) onSubscribed:(id)control {
+    [self onSomething:(int) [control isOn] withKey:@"IsSubscribed"];

 }
 
 }
 

-- (void) onIgnored:(UIPreferencesControlTableCell *)cell {
-    [self onSomething:cell withKey:@"IsIgnored"];
+- (void) onIgnored:(id)control {
+    [self onSomething:(int) [control isOn] withKey:@"IsIgnored"];

 }
 
 }
 

-- (id) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

     if (package_ == nil)
         return nil;
 
     if (package_ == nil)
         return nil;
 

-    switch (group) {
-        case 0: switch (row) {
-            case 0:
-                return subscribedCell_;
-            case 1:
-                return ignoredCell_;
-            _nodefault
-        } break;
-
-        case 1: switch (row) {
-            case 0: {
-                UIPreferencesControlTableCell *cell([[[UIPreferencesControlTableCell alloc] init] autorelease]);
-                [cell setShowSelection:NO];
-                [cell setTitle:UCLocalize("SHOW_ALL_CHANGES_EX")];
-                return cell;
-            }
-
-            _nodefault
-        } break;
-
+    switch ([indexPath row]) {
+        case 0: return subscribedCell_;
+        case 1: return ignoredCell_;
+        

         _nodefault
     }
 
         _nodefault
     }
 


@@ -7408,26 +7351,29 @@ freeing the view controllers on tab change */
 
         [[self navigationItem] setTitle:UCLocalize("SETTINGS")];
 
 
         [[self navigationItem] setTitle:UCLocalize("SETTINGS")];
 

-        table_ = [[UIPreferencesTable alloc] initWithFrame:[[self view] bounds]];
+        table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
+        [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+        [table_ setAllowsSelection:NO];

         [[self view] addSubview:table_];
 
         [[self view] addSubview:table_];
 

-        subscribedSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
-        [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventTouchUpInside];
+        subscribedSwitch_ = [[objc_getClass("UISwitch") alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
+        [subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
+        [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged];

 
 

-        ignoredSwitch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(200, 10, 50, 20)];
-        [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventTouchUpInside];
+        ignoredSwitch_ = [[objc_getClass("UISwitch") alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
+        [ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
+        [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged];

 
 

-        subscribedCell_ = [[UIPreferencesControlTableCell alloc] init];
-        [subscribedCell_ setShowSelection:NO];
-        [subscribedCell_ setTitle:UCLocalize("SHOW_ALL_CHANGES")];
-        [subscribedCell_ setControl:subscribedSwitch_];
+        subscribedCell_ = [[UITableViewCell alloc] init];
+        [subscribedCell_ setText:UCLocalize("SHOW_ALL_CHANGES")];
+        [subscribedCell_ setAccessoryView:subscribedSwitch_];

 
 

-        ignoredCell_ = [[UIPreferencesControlTableCell alloc] init];
-        [ignoredCell_ setShowSelection:NO];
-        [ignoredCell_ setTitle:UCLocalize("IGNORE_UPGRADES")];
-        [ignoredCell_ setControl:ignoredSwitch_];
+        ignoredCell_ = [[UITableViewCell alloc] init];
+        [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")];
+        [ignoredCell_ setAccessoryView:ignoredSwitch_];

 
         [table_ setDataSource:self];
 
         [table_ setDataSource:self];

+        [table_ setDelegate:self];

         [self reloadData];
     } return self;
 }
         [self reloadData];
     } return self;
 }


@@ -7438,8 +7384,8 @@ freeing the view controllers on tab change */
     package_ = [database_ packageWithName:name_];
     if (package_ != nil) {
         [package_ retain];
     package_ = [database_ packageWithName:name_];
     if (package_ != nil) {
         [package_ retain];

-        [subscribedSwitch_ setValue:([package_ subscribed] ? 1 : 0) animated:NO];
-        [ignoredSwitch_ setValue:([package_ ignored] ? 1 : 0) animated:NO];
+        [subscribedSwitch_ setOn:([package_ subscribed] ? 1 : 0) animated:NO];
+        [ignoredSwitch_ setOn:([package_ ignored] ? 1 : 0) animated:NO];

     }
 
     [table_ reloadData];
     }
 
     [table_ reloadData];


@@ -7485,13 +7431,20 @@ freeing the view controllers on tab change */
 @end
 /* }}} */
 /* Role Controller {{{ */
 @end
 /* }}} */
 /* Role Controller {{{ */

-@interface RoleController : CYViewController {
+@interface RoleController : CYViewController <
+    UITableViewDataSource,
+    UITableViewDelegate
+> {

     _transient Database *database_;
     id roledelegate_;
     UITableView *table_;
     UISegmentedControl *segment_;
     UIView *container_;
 }
     _transient Database *database_;
     id roledelegate_;
     UITableView *table_;
     UISegmentedControl *segment_;
     UIView *container_;
 }

+
+- (void) showDoneButton;
+- (void) resizeSegmentedControl;
+

 @end
 
 @implementation RoleController
 @end
 
 @implementation RoleController


@@ -7652,9 +7605,15 @@ freeing the view controllers on tab change */
     bool dropped_;
     bool updating_;
     id updatedelegate_;
     bool dropped_;
     bool updating_;
     id updatedelegate_;

-    UIViewController *root_;
+    UITabBarController *root_;

 }
 
 }
 

+- (void) setTabBarController:(UITabBarController *)controller;
+
+- (void) dropBar:(BOOL)animated;
+- (void) beginUpdate;
+- (void) raiseBar:(BOOL)animated;
+

 @end
 
 @implementation CYContainer
 @end
 
 @implementation CYContainer


@@ -7686,7 +7645,7 @@ freeing the view controllers on tab change */
     return YES; /* XXX: return YES; */
 }
 
     return YES; /* XXX: return YES; */
 }
 

-- (void) setRootController:(UIViewController *)controller {
+- (void) setTabBarController:(UITabBarController *)controller {

     root_ = controller;
     [[self view] addSubview:[root_ view]];
 }
     root_ = controller;
     [[self view] addSubview:[root_ view]];
 }


@@ -7909,8 +7868,8 @@ typedef enum {
     bool loaded_;
 }
 
     bool loaded_;
 }
 

-- (UIViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class;
-- (void) setPage:(UIViewController *)page;
+- (UCViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class;
+- (void) setPage:(UCViewController *)page;

 
 @end
 
 
 @end
 


@@ -7992,7 +7951,7 @@ static _finline void _setHomePage(Cydia *self) {
     if (tag_ != 4 && search_ != nil)
         [search_ reloadData];
 
     if (tag_ != 4 && search_ != nil)
         [search_ reloadData];
 

-    [[tabbar_ selectedViewController] reloadData];
+    [(CYNavigationController *)[tabbar_ selectedViewController] reloadData];

 }
 
 - (int)indexOfTabWithTag:(int)tag {
 }
 
 - (int)indexOfTabWithTag:(int)tag {


@@ -8234,17 +8193,17 @@ static _finline void _setHomePage(Cydia *self) {
     [self complete];
 }
 
     [self complete];
 }
 

-- (void) setPage:(UIViewController *)page {
+- (void) setPage:(UCViewController *)page {

     [page setDelegate:self];
 
     [page setDelegate:self];
 

-    UINavigationController *navController = [tabbar_ selectedViewController];
+    CYNavigationController *navController = (CYNavigationController *) [tabbar_ selectedViewController];

     [navController setViewControllers:[NSArray arrayWithObject:page] animated:NO];
     [navController setViewControllers:[NSArray arrayWithObject:page] animated:NO];

-    for (UIViewController *page in [tabbar_ viewControllers]) {
+    for (CYNavigationController *page in [tabbar_ viewControllers]) {

         if (page != navController) [page setViewControllers:nil];
     }
 }
 
         if (page != navController) [page setViewControllers:nil];
     }
 }
 

-- (UIViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class {
+- (UCViewController *) _pageForURL:(NSURL *)url withClass:(Class)_class {

     CYBrowserController *browser = [[[_class alloc] init] autorelease];
     [browser loadURL:url];
     return browser;
     CYBrowserController *browser = [[[_class alloc] init] autorelease];
     [browser loadURL:url];
     return browser;


@@ -8296,7 +8255,7 @@ static _finline void _setHomePage(Cydia *self) {
 - (void) tabBarController:(id)tabBarController didSelectViewController:(UIViewController *)viewController {    
     int tag = [[viewController tabBarItem] tag];
     if (tag == tag_) {
 - (void) tabBarController:(id)tabBarController didSelectViewController:(UIViewController *)viewController {    
     int tag = [[viewController tabBarItem] tag];
     if (tag == tag_) {

-        [[tabbar_ selectedViewController] popToRootViewControllerAnimated:YES];
+        [(CYNavigationController *)[tabbar_ selectedViewController] popToRootViewControllerAnimated:YES];

         return;
     } else if (tag_ == 1) {
         [[self sectionsController] resetView];
         return;
     } else if (tag_ == 1) {
         [[self sectionsController] resetView];


@@ -8380,7 +8339,7 @@ static _finline void _setHomePage(Cydia *self) {
             Queuing_ = true;
 
             [[[[tabbar_ viewControllers] objectAtIndex:[self indexOfTabWithTag:kManageTag] != -1 ? [self indexOfTabWithTag:kManageTag] : [self indexOfTabWithTag:kInstalledTag]] tabBarItem] setBadgeValue:UCLocalize("Q_D")];
             Queuing_ = true;
 
             [[[[tabbar_ viewControllers] objectAtIndex:[self indexOfTabWithTag:kManageTag] != -1 ? [self indexOfTabWithTag:kManageTag] : [self indexOfTabWithTag:kInstalledTag]] tabBarItem] setBadgeValue:UCLocalize("Q_D")];

-            [[tabbar_ selectedViewController] reloadData];
+            [(CYNavigationController *)[tabbar_ selectedViewController] reloadData];

             
             [queueDelegate_ queueStatusDidChange];
         }
             
             [queueDelegate_ queueStatusDidChange];
         }


@@ -8473,7 +8432,7 @@ static _finline void _setHomePage(Cydia *self) {
     [window_ setUserInteractionEnabled:YES];
 }
 
     [window_ setUserInteractionEnabled:YES];
 }
 

-- (UIViewController *) pageForPackage:(NSString *)name {
+- (UCViewController *) pageForPackage:(NSString *)name {

     if (Package *package = [database_ packageWithName:name]) {
         PackageController *view([self packageController]);
         [view setPackage:package];
     if (Package *package = [database_ packageWithName:name]) {
         PackageController *view([self packageController]);
         [view setPackage:package];


@@ -8485,7 +8444,7 @@ static _finline void _setHomePage(Cydia *self) {
     }
 }
 
     }
 }
 

-- (UIViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag {
+- (UCViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag {

     if (tag != NULL)
         *tag = -1;
 
     if (tag != NULL)
         *tag = -1;
 


@@ -8537,16 +8496,19 @@ static _finline void _setHomePage(Cydia *self) {
 - (void) applicationOpenURL:(NSURL *)url {
     [super applicationOpenURL:url];
     int tag;
 - (void) applicationOpenURL:(NSURL *)url {
     [super applicationOpenURL:url];
     int tag;

-    if (UIViewController *page = [self pageForURL:url hasTag:&tag]) {
+    if (UCViewController *page = [self pageForURL:url hasTag:&tag]) {

         [self setPage:page];
         tag_ = tag;
         [tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])];
     }
 }
 
         [self setPage:page];
         tag_ = tag;
         [tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])];
     }
 }
 

-- (void) applicationWillResignActive:(UIApplication *)application {
+- (void) applicationWillResignActive:(UIApplication *)application {    

     // Stop refreshing if you get a phone call or lock the device.
     if ([container_ updating]) [container_ cancelUpdate];
     // Stop refreshing if you get a phone call or lock the device.
     if ([container_ updating]) [container_ cancelUpdate];

+    
+    if ([[self superclass] instancesRespondToSelector:@selector(applicationWillResignActive:)])
+        [super applicationWillResignActive:application];

 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {


@@ -8634,9 +8596,8 @@ static _finline void _setHomePage(Cydia *self) {
         [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage.png"] tag:kManageTag] autorelease] atIndex:3];
     }
     
         [items insertObject:[[[UITabBarItem alloc] initWithTitle:UCLocalize("MANAGE") image:[UIImage applicationImageNamed:@"manage.png"] tag:kManageTag] autorelease] atIndex:3];
     }
     

-    for (int i = 0; i < [items count]; i++) {
+    for (size_t i(0); i != [items count]; i++)

         [[controllers objectAtIndex:i] setTabBarItem:[items objectAtIndex:i]];
         [[controllers objectAtIndex:i] setTabBarItem:[items objectAtIndex:i]];

-    }

 
     tabbar_ = [[CYTabBarController alloc] initWithDatabase:database_];
     [tabbar_ setViewControllers:controllers];
 
     tabbar_ = [[CYTabBarController alloc] initWithDatabase:database_];
     [tabbar_ setViewControllers:controllers];


@@ -8645,7 +8606,7 @@ static _finline void _setHomePage(Cydia *self) {
 
     container_ = [[CYContainer alloc] initWithDatabase:database_];
     [container_ setUpdateDelegate:self];
 
     container_ = [[CYContainer alloc] initWithDatabase:database_];
     [container_ setUpdateDelegate:self];

-    [container_ setRootController:tabbar_];
+    [container_ setTabBarController:tabbar_];

     [window_ addSubview:[container_ view]];
     [[tabbar_ view] setFrame:CGRectMake(0, -20.0f, [window_ bounds].size.width, [window_ bounds].size.height)];
 
     [window_ addSubview:[container_ view]];
     [[tabbar_ view] setFrame:CGRectMake(0, -20.0f, [window_ bounds].size.width, [window_ bounds].size.height)];
 


@@ -8986,4 +8947,4 @@ int main(int argc, char *argv[]) { _pooled
     CFRelease(Locale_);
 
     return value;
     CFRelease(Locale_);
 
     return value;

-}
\ No newline at end of file
+}