From: Grant Paul <chpwn@chpwn.com>
Date: Fri, 4 Feb 2011 00:01:35 +0000 (-0800)
Subject: Merge branch 'restructure' into develop-1.2
X-Git-Tag: v1.1.0%b1~367^2~1
X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/fae8ee564d1871cd8850b16437294d07f77dc2da?ds=inline;hp=-c

Merge branch 'restructure' into develop-1.2
---

fae8ee564d1871cd8850b16437294d07f77dc2da
diff --combined MobileCydia.mm
index 8b47cc22,cc005907..ccec42b8
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@@ -4039,40 -4039,27 +4039,40 @@@ static NSString *Warning_
  
  @implementation CYEmulatedLoadingController
  
 -- (CYEmulatedLoadingController *) init {
 -    if ((self = [super init])) {
 -        [[self view] setBackgroundColor:[UIColor pinStripeColor]];
 -
 -        indicator_ = [[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]];
 -        [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [[self view] addSubview:indicator_];
 -        [indicator_ release];
 -
 -        tabbar_ = [[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)];
 -        [tabbar_ setFrame:CGRectMake(0.0f, [[self view] bounds].size.height - [tabbar_ bounds].size.height, [[self view] bounds].size.width, [tabbar_ bounds].size.height)];
 -        [tabbar_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth];
 -        [[self view] addSubview:tabbar_];
 -        [tabbar_ release];
 -
 -        navbar_ = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 0, 44.0f)];
 -        [navbar_ setFrame:CGRectMake(0.0f, 0.0f, [[self view] bounds].size.width, [navbar_ bounds].size.height)];
 -        [navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleWidth];
 -        [[self view] addSubview:navbar_];
 -        [navbar_ release];
 -    } return self;
 +- (void) dealloc {
 +    [self releaseSubviews];
 +
 +    [super dealloc];
 +}
 +
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +    [[self view] setBackgroundColor:[UIColor pinStripeColor]];
 +
 +    indicator_ = [[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]];
 +    [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [[self view] addSubview:indicator_];
 +
 +    tabbar_ = [[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)];
 +    [tabbar_ setFrame:CGRectMake(0.0f, [[self view] bounds].size.height - [tabbar_ bounds].size.height, [[self view] bounds].size.width, [tabbar_ bounds].size.height)];
 +    [tabbar_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth];
 +    [[self view] addSubview:tabbar_];
 +
 +    navbar_ = [[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 0, 44.0f)];
 +    [navbar_ setFrame:CGRectMake(0.0f, 0.0f, [[self view] bounds].size.width, [navbar_ bounds].size.height)];
 +    [navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleWidth];
 +    [[self view] addSubview:navbar_];
 +}
 +
 +- (void) releaseSubviews {
 +    [indicator_ release];
 +    indicator_ = nil;
 +
 +    [tabbar_ release];
 +    tabbar_ = nil;
 +
 +    [navbar_ release];
 +    navbar_ = nil;
  }
  
  @end
@@@ -4092,10 -4079,6 +4092,10 @@@
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://url/%@", [[[webview_ request] URL] absoluteString]]];
 +}
 +
  - (void) setHeaders:(NSDictionary *)headers forHost:(NSString *)host {
  }
  
@@@ -5010,6 -4993,10 +5010,10 @@@ bool DepSubstrate(const pkgCache::VerIt
      [self setNeedsDisplay];
  }
  
+ - (NSString *) accessibilityLabel {
+     return [NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), name_, description_];
+ }
+ 
  - (void) setPackage:(Package *)package {
      [self clearPackage];
      [package parse];
@@@ -5238,6 -5225,10 +5242,10 @@@
      [switch_ setFrame:CGRectMake(frame.size.width - 102, 9, rect.size.width, rect.size.height)];
  }
  
+ - (NSString *) accessibilityLabel {
+     return name_;
+ }
+ 
  - (void) drawContentRect:(CGRect)rect {
      bool highlighted(highlighted_ && !editing_);
  
@@@ -5284,12 -5275,12 +5292,12 @@@
  @implementation FileTable
  
  - (void) dealloc {
 -    if (package_ != nil)
 -        [package_ release];
 -    if (name_ != nil)
 -        [name_ release];
 +    [self releaseSubviews];
 +
 +    [package_ release];
 +    [name_ release];
      [files_ release];
 -    [list_ release];
 +
      [super dealloc];
  }
  
@@@ -5315,35 -5306,21 +5323,35 @@@
      return cell;
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@/files", [package_ id]]];
 +}
 +
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +
 +    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
 +    [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [list_ setRowHeight:24.0f];
 +    [list_ setDataSource:self];
 +    [list_ setDelegate:self];
 +    [[self view] addSubview:list_];
 +}
 +
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:UCLocalize("INSTALLED_FILES")];
 +}
 +
 +- (void) releaseSubviews {
 +    [list_ release];
 +    list_ = nil;
 +}
 +
  - (id) initWithDatabase:(Database *)database {
      if ((self = [super init]) != nil) {
          database_ = database;
  
 -        [[self navigationItem] setTitle:UCLocalize("INSTALLED_FILES")];
 -
          files_ = [[NSMutableArray arrayWithCapacity:32] retain];
 -
 -        list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
 -        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [list_ setRowHeight:24.0f];
 -        [[self view] addSubview:list_];
 -
 -        [list_ setDataSource:self];
 -        [list_ setDelegate:self];
      } return self;
  }
  
@@@ -5393,8 -5370,6 +5401,8 @@@
  }
  
  - (void) reloadData {
 +    [super reloadData];
 +
      [self setPackage:[database_ packageWithName:name_]];
  }
  
@@@ -5439,10 -5414,6 +5447,10 @@@
      [super release];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", [package_ id]]];
 +}
 +
  /* XXX: this is not safe at all... localization of /fail/ */
  - (void) _clickButtonWithName:(NSString *)name {
      if ([name isEqualToString:UCLocalize("CLEAR")])
@@@ -5915,8 -5886,6 +5923,8 @@@
      _transient Database *database_;
      FilteredPackageTable *packages_;
      NSString *title_;
 +    SEL filter_;
 +    id object_;
  }
  
  - (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
@@@ -5926,7 -5895,7 +5934,7 @@@
  @implementation FilteredPackageController
  
  - (void) dealloc {
 -    [packages_ release];
 +    [self releaseSubviews];
      [title_ release];
  
      [super dealloc];
@@@ -5944,40 -5913,29 +5952,40 @@@
      [[self navigationController] pushViewController:view animated:YES];
  }
  
 -- (NSString *) title { return title_; }
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +
 +    packages_ = [[FilteredPackageTable alloc]
 +        initWithFrame:[[self view] bounds]
 +        database:database_
 +        target:self
 +        action:@selector(didSelectPackage:)
 +        filter:filter_
 +        with:object_
 +    ];
 +    [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [[self view] addSubview:packages_];
 +}
 +
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:title_];
 +}
 +
 +- (void) releaseSubviews {
 +    [packages_ release];
 +}
  
  - (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
      if ((self = [super init]) != nil) {
          database_ = database;
          title_ = [title copy];
 -        [[self navigationItem] setTitle:title_];
 -
 -        packages_ = [[FilteredPackageTable alloc]
 -            initWithFrame:[[self view] bounds]
 -            database:database
 -            target:self
 -            action:@selector(didSelectPackage:)
 -            filter:filter
 -            with:object
 -        ];
 -
 -        [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [[self view] addSubview:packages_];
 +        filter_ = filter;
 +        object_ = object;
      } return self;
  }
  
  - (void) reloadData {
 +    [super reloadData];
      [packages_ reloadData];
  }
  
@@@ -6001,10 -5959,6 +6009,10 @@@
      return NO;
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:@"cydia://home"];
 +}
 +
  - (void) _setMoreHeaders:(NSMutableURLRequest *)request {
      [super _setMoreHeaders:request];
  
@@@ -6071,10 -6025,6 +6079,10 @@@
  
  @implementation ManageController
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:@"cydia://manage"];
 +}
 +
  - (id) init {
      if ((self = [super init]) != nil) {
          [[self navigationItem] setTitle:UCLocalize("MANAGE")];
@@@ -6265,7 -6215,6 +6273,7 @@@
      id root_;
  }
  
 +- (NSArray *) navigationURLItems;
  - (void) dropBar:(BOOL)animated;
  - (void) beginUpdate;
  - (void) raiseBar:(BOOL)animated;
@@@ -6275,19 -6224,6 +6283,19 @@@
  
  @implementation CYTabBarController
  
 +- (NSArray *) navigationURLItems {
 +    NSMutableArray *items([NSMutableArray array]);
 +
 +    // XXX:Deal with transient view controllers.
 +    for (id navigation in [self viewControllers]) {
 +        NSArray *stack = [navigation performSelector:@selector(navigationURLStack)];
 +        if (stack != nil)
 +            [items addObject:stack];
 +    }
 +
 +    return items;
 +}
 +
  - (void) reloadData {
      size_t count([[self viewControllers] count]);
      for (size_t i(0); i != count; ++i) {
@@@ -6536,7 -6472,6 +6544,7 @@@
      _transient id<UINavigationControllerDelegate> delegate_;
  }
  
 +- (NSArray *) navigationURLStack;
  - (id) initWithDatabase:(Database *)database;
  - (void) reloadData;
  
@@@ -6549,18 -6484,6 +6557,18 @@@
      [super dealloc];
  }
  
 +- (NSArray *) navigationURLStack {
 +    NSMutableArray *stack([NSMutableArray array]);
 +
 +    for (CYViewController *controller in [self viewControllers]) {
 +        NSString *url = [[controller navigationURL] absoluteString];
 +        if (url != nil)
 +            [stack addObject:url];
 +    }
 +
 +    return stack;
 +}
 +
  - (void) reloadData {
      size_t count([[self viewControllers] count]);
      for (size_t i(0); i != count; ++i) {
@@@ -6685,7 -6608,6 +6693,7 @@@
  
  /* Section Controller {{{ */
  @interface SectionController : FilteredPackageController {
 +    NSString *section_;
  }
  
  - (id) initWithDatabase:(Database *)database section:(NSString *)section;
@@@ -6694,14 -6616,6 +6702,14 @@@
  
  @implementation SectionController
  
 +- (NSURL *) navigationURL {
 +    NSString *name = section_;
 +    if (name == nil)
 +        name = @"all";
 +
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sections/%@", name]];
 +}
 +
  - (id) initWithDatabase:(Database *)database section:(NSString *)name {
      NSString *title;
  
@@@ -6713,8 -6627,6 +6721,8 @@@
          title = UCLocalize("NO_SECTION");
      }
  
 +    section_ = name;
 +
      if ((self = [super initWithDatabase:database title:title filter:@selector(isVisibleInSection:) with:name]) != nil) {
      } return self;
  }
@@@ -6734,6 -6646,9 +6742,6 @@@
  }
  
  - (id) initWithDatabase:(Database *)database;
 -- (void) reloadData;
 -- (void) resetView;
 -
  - (void) editButtonClicked;
  
  @end
@@@ -6741,17 -6656,15 +6749,17 @@@
  @implementation SectionsController
  
  - (void) dealloc {
 -    [list_ setDataSource:nil];
 -    [list_ setDelegate:nil];
 -
 +    [self releaseSubviews];
      [sections_ release];
      [filtered_ release];
 -    [list_ release];
 +
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:@"cydia://sections"];
 +}
 +
  - (void) updateNavigationItem {
      [[self navigationItem] setTitle:editing_ ? UCLocalize("SECTION_VISIBILITY") : UCLocalize("SECTIONS")];
      if ([sections_ count] == 0) {
@@@ -6824,38 -6737,28 +6832,38 @@@
      [[self navigationController] pushViewController:controller animated:YES];
  }
  
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +
 +    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
 +    [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [list_ setRowHeight:45.0f];
 +    [list_ setDataSource:self];
 +    [list_ setDelegate:self];
 +    [[self view] addSubview:list_];
 +}
 +
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:UCLocalize("SECTIONS")];
 +}
 +
 +- (void) releaseSubviews {
 +    [list_ release];
 +    list_ = nil;
 +}
 +
  - (id) initWithDatabase:(Database *)database {
      if ((self = [super init]) != nil) {
          database_ = database;
  
 -        [[self navigationItem] setTitle:UCLocalize("SECTIONS")];
 -
          sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
          filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];
 -
 -        list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
 -        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [list_ setRowHeight:45.0f];
 -        [[self view] addSubview:list_];
 -
 -        [list_ setDataSource:self];
 -        [list_ setDelegate:self];
 -
 -        [self reloadData];
      } return self;
  }
  
  - (void) reloadData {
 +    [super reloadData];
 +
      NSArray *packages = [database_ packages];
  
      [sections_ removeAllObjects];
@@@ -6910,6 -6813,11 +6918,6 @@@
      _trace();
  }
  
 -- (void) resetView {
 -    if (editing_)
 -        [self editButtonClicked];
 -}
 -
  - (void)editButtonClicked {
      [self setEditing:!editing_];
  }
@@@ -6938,20 -6846,18 +6946,20 @@@
  @implementation ChangesController
  
  - (void) dealloc {
 -    [list_ setDelegate:nil];
 -    [list_ setDataSource:nil];
 -
 +    [self releaseSubviews];
      CFRelease(packages_);
 -
      [sections_ release];
 -    [list_ release];
 +
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:@"cydia://changes"];
 +}
 +
  - (void) viewDidAppear:(BOOL)animated {
      [super viewDidAppear:animated];
 +
      if (!hasSentFirstLoad_) {
          hasSentFirstLoad_ = YES;
          [self performSelector:@selector(reloadData) withObject:nil afterDelay:0.0];
@@@ -7020,35 -6926,23 +7028,35 @@@
      [delegate_ distUpgrade];
  }
  
 -- (NSString *) title { return UCLocalize("CHANGES"); }
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +
 +    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
 +    [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [list_ setRowHeight:73];
 +    [list_ setDataSource:self];
 +    [list_ setDelegate:self];
 +    [[self view] addSubview:list_];
 +}
 +
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:UCLocalize("CHANGES")];
 +}
 +
 +- (void) releaseSubviews {
 +    [list_ release];
 +    list_ = nil;
 +}
  
  - (id) initWithDatabase:(Database *)database {
      if ((self = [super init]) != nil) {
          database_ = database;
 -        [[self navigationItem] setTitle:UCLocalize("CHANGES")];
 +
 +        // We load after the view is visible, so don't "magically" load beforehand.
 +        loaded_ = YES;
  
          packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
          sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 -
 -        list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
 -        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [list_ setRowHeight:73];
 -        [[self view] addSubview:list_];
 -
 -        [list_ setDataSource:self];
 -        [list_ setDelegate:self];
      } return self;
  }
  
@@@ -7174,7 -7068,6 +7182,7 @@@
      UISearchBarDelegate
  > {
      UISearchBar *search_;
 +    BOOL searchloaded_;
  }
  
  - (id) initWithDatabase:(Database *)database;
@@@ -7190,13 -7083,8 +7198,13 @@@
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://search/%@", [search_ text]]];
 +}
 +
  - (void) setSearchTerm:(NSString *)searchTerm {
      [search_ setText:searchTerm];
 +    [self reloadData];
  }
  
  - (void) searchBarSearchButtonClicked:(UISearchBar *)searchBar {
@@@ -7206,22 -7094,18 +7214,22 @@@
  }
  
  - (void) searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)text {
 -    [packages_ setObject:text forFilter:@selector(isUnfilteredAndSelectedForBy:)];
 +    [packages_ setObject:[search_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)];
      [self reloadData];
  }
  
  - (id) initWithDatabase:(Database *)database {
 -    return [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:nil];
 +    if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:nil])) {
 +        search_ = [[UISearchBar alloc] init];
 +    } return self;
  }
  
  - (void)viewDidAppear:(BOOL)animated {
      [super viewDidAppear:animated];
 -    if (!search_) {
 -        search_ = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)];
 +
 +    if (!searchloaded_) {
 +        searchloaded_ = YES;
 +        [search_ setFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)];
          [search_ layoutSubviews];
          [search_ setPlaceholder:UCLocalize("SEARCH_EX")];
  
@@@ -7238,9 -7122,14 +7246,9 @@@
      }
  }
  
 -- (void) _reloadData {
 -}
 -
  - (void) reloadData {
 -    _profile(SearchController$reloadData)
 -        [packages_ reloadData];
 -    _end
 -    PrintTimes();
 +    [packages_ setObject:[search_ text]];
 +    [super reloadData];
      [packages_ resetCursor];
  }
  
@@@ -7273,17 -7162,18 +7281,17 @@@
  @implementation PackageSettingsController
  
  - (void) dealloc {
 +    [self releaseSubviews];
      [name_ release];
 -    if (package_ != nil)
 -        [package_ release];
 -    [table_ release];
 -    [subscribedSwitch_ release];
 -    [ignoredSwitch_ release];
 -    [subscribedCell_ release];
 -    [ignoredCell_ release];
 +    [package_ release];
  
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@/settings", [package_ id]]];
 +}
 +
  - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
      if (package_ == nil)
          return 0;
@@@ -7332,69 -7222,48 +7340,69 @@@
      return nil;
  }
  
 -- (NSString *) title { return UCLocalize("SETTINGS"); }
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
  
 -- (id) initWithDatabase:(Database *)database package:(NSString *)package {
 -    if ((self = [super init])) {
 -        database_ = database;
 -        name_ = [package retain];
 +    table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
 +    [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [table_ setDataSource:self];
 +    [table_ setDelegate:self];
 +    [[self view] addSubview:table_];
  
 -        [[self navigationItem] setTitle:UCLocalize("SETTINGS")];
 +    subscribedSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
 +    [subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 +    [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged];
  
 -        table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
 -        [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [[self view] addSubview:table_];
 +    ignoredSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
 +    [ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 +    [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged];
 +    // Disable this switch, since it only reflects (not modifies) the ignored state.
 +    [ignoredSwitch_ setUserInteractionEnabled:NO];
  
 -        subscribedSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
 -        [subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 -        [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged];
 +    subscribedCell_ = [[UITableViewCell alloc] init];
 +    [subscribedCell_ setText:UCLocalize("SHOW_ALL_CHANGES")];
 +    [subscribedCell_ setAccessoryView:subscribedSwitch_];
 +    [subscribedCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
  
 -        ignoredSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
 -        [ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 -        [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged];
 -        // Disable this switch, since it only reflects (not modifies) the ignored state.
 -        [ignoredSwitch_ setUserInteractionEnabled:NO];
 +    ignoredCell_ = [[UITableViewCell alloc] init];
 +    [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")];
 +    [ignoredCell_ setAccessoryView:ignoredSwitch_];
 +    [ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
 +    // FIXME: Ignored state is not saved.
 +    [ignoredCell_ setUserInteractionEnabled:NO];
 +}
  
 -        subscribedCell_ = [[UITableViewCell alloc] init];
 -        [subscribedCell_ setText:UCLocalize("SHOW_ALL_CHANGES")];
 -        [subscribedCell_ setAccessoryView:subscribedSwitch_];
 -        [subscribedCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:UCLocalize("SETTINGS")];
 +}
  
 -        ignoredCell_ = [[UITableViewCell alloc] init];
 -        [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")];
 -        [ignoredCell_ setAccessoryView:ignoredSwitch_];
 -        [ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
 -        // FIXME: Ignored state is not saved.
 -        [ignoredCell_ setUserInteractionEnabled:NO];
 +- (void) releaseSubviews {
 +    [ignoredCell_ release];
 +    ignoredCell_ = nil;
  
 -        [table_ setDataSource:self];
 -        [table_ setDelegate:self];
 -        [self reloadData];
 +    [subscribedCell_ release];
 +    subscribedCell_ = nil;
 +
 +    [table_ release];
 +    table_ = nil;
 +
 +    [ignoredSwitch_ release];
 +    ignoredSwitch_ = nil;
 +
 +    [subscribedSwitch_ release];
 +    subscribedSwitch_ = nil;
 +}
 +
 +- (id) initWithDatabase:(Database *)database package:(NSString *)package {
 +    if ((self = [super init])) {
 +        database_ = database;
 +        name_ = [package retain];
      } return self;
  }
  
  - (void) reloadData {
 +    [super reloadData];
 +
      if (package_ != nil)
          [package_ autorelease];
      package_ = [database_ packageWithName:name_];
@@@ -7426,10 -7295,6 +7434,10 @@@
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@/signature", package_]];
 +}
 +
  - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
      // XXX: dude!
      [super webView:view didClearWindowObject:window forFrame:frame];
@@@ -7468,9 -7333,7 +7476,9 @@@
      [super dealloc];
  }
  
 -- (NSString *) title { return UCLocalize("INSTALLED"); }
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:@"cydia://installed"];
 +}
  
  - (id) initWithDatabase:(Database *)database {
      if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) {
@@@ -7592,6 -7455,10 +7600,10 @@@
      } return self;
  }
  
+ - (NSString *) accessibilityLabel {
+     return label_;
+ }
+ 
  - (void) drawContentRect:(CGRect)rect {
      bool highlighted(highlighted_);
      float width(rect.size.width);
@@@ -7615,7 -7482,6 +7627,7 @@@
  /* }}} */
  /* Source Controller {{{ */
  @interface SourceController : FilteredPackageController {
 +    Source *source_;
  }
  
  - (id) initWithDatabase:(Database *)database source:(Source *)source;
@@@ -7624,13 -7490,7 +7636,13 @@@
  
  @implementation SourceController
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [source_ name]]];
 +}
 +
  - (id) initWithDatabase:(Database *)database source:(Source *)source {
 +    source_ = source;
 +
      if ((self = [super initWithDatabase:database title:[source label] filter:@selector(isVisibleInSource:) with:source]) != nil) {
      } return self;
  }
@@@ -7661,6 -7521,7 +7673,6 @@@
  }
  
  - (id) initWithDatabase:(Database *)database;
 -
  - (void) updateButtonsForEditingStatus:(BOOL)editing animated:(BOOL)animated;
  
  @end
@@@ -7676,11 -7537,12 +7688,11 @@@
  }
  
  - (void) dealloc {
 -    if (href_ != nil)
 -        [href_ release];
 -    if (hud_ != nil)
 -        [hud_ release];
 -    if (error_ != nil)
 -        [error_ release];
 +    [self releaseSubviews];
 +
 +    [href_ release];
 +    [hud_ release];
 +    [error_ release];
  
      //[self _releaseConnection:installer_];
      [self _releaseConnection:trivial_];
@@@ -7689,13 -7551,10 +7701,13 @@@
      //[self _releaseConnection:automatic_];
  
      [sources_ release];
 -    [list_ release];
      [super dealloc];
  }
  
 +- (NSURL *) navigationURL {
 +    return [NSURL URLWithString:@"cydia://sources"];
 +}
 +
  - (void) viewDidAppear:(BOOL)animated {
      [super viewDidAppear:animated];
      [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
@@@ -7897,6 -7756,8 +7909,6 @@@
      [self _endConnection:connection];
  }
  
 -- (NSString *) title { return UCLocalize("SOURCES"); }
 -
  - (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
      NSMutableURLRequest *request = [NSMutableURLRequest
          requestWithURL:[NSURL URLWithString:href]
@@@ -7974,37 -7835,27 +7986,37 @@@
      }
  }
  
 -- (id) initWithDatabase:(Database *)database {
 -    if ((self = [super init]) != nil) {
 -        [[self navigationItem] setTitle:UCLocalize("SOURCES")];
 -        [self updateButtonsForEditingStatus:NO animated:NO];
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
  
 -        database_ = database;
 -        sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
 +    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
 +    [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [list_ setRowHeight:56];
 +    [list_ setDataSource:self];
 +    [list_ setDelegate:self];
 +    [[self view] addSubview:list_];
 +}
  
 -        list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
 -        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [list_ setRowHeight:56];
 -        [[self view] addSubview:list_];
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:UCLocalize("SOURCES")];
 +    [self updateButtonsForEditingStatus:NO animated:NO];
 +}
  
 -        [list_ setDataSource:self];
 -        [list_ setDelegate:self];
 +- (void) releaseSubviews {
 +    [list_ release];
 +    list_ = nil;
 +}
  
 -        [self reloadData];
 +- (id) initWithDatabase:(Database *)database {
 +    if ((self = [super init]) != nil) {
 +        database_ = database;
 +        sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
      } return self;
  }
  
  - (void) reloadData {
 +    [super reloadData];
 +
      pkgSourceList list;
      if (!list.ReadMainList())
          return;
@@@ -8113,63 -7964,48 +8125,63 @@@
  @end
  
  @implementation SettingsController
 +
  - (void) dealloc {
 +    [self releaseSubviews];
 +
 +    [super dealloc];
 +}
 +
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +
 +    table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
 +    [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 +    [table_ setDelegate:self];
 +    [table_ setDataSource:self];
 +    [[self view] addSubview:table_];
 +
 +    NSArray *items = [NSArray arrayWithObjects:
 +        UCLocalize("USER"),
 +        UCLocalize("HACKER"),
 +        UCLocalize("DEVELOPER"),
 +    nil];
 +    segment_ = [[UISegmentedControl alloc] initWithItems:items];
 +    container_ = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)];
 +    [container_ addSubview:segment_];
 +}
 +
 +- (void) viewDidLoad {
 +    [[self navigationItem] setTitle:UCLocalize("WHO_ARE_YOU")];
 +
 +    int index = -1;
 +    if ([Role_ isEqualToString:@"User"]) index = 0;
 +    if ([Role_ isEqualToString:@"Hacker"]) index = 1;
 +    if ([Role_ isEqualToString:@"Developer"]) index = 2;
 +    if (index != -1) {
 +        [segment_ setSelectedSegmentIndex:index];
 +        [self showDoneButton];
 +    }
 +
 +    [segment_ addTarget:self action:@selector(segmentChanged:) forControlEvents:UIControlEventValueChanged];
 +    [self resizeSegmentedControl];
 +}
 +
 +- (void) releaseSubviews {
      [table_ release];
 +    table_ = nil;
 +
      [segment_ release];
 -    [container_ release];
 +    segment_ = nil;
  
 -    [super dealloc];
 +    [container_ release];
 +    container_ = nil;
  }
  
  - (id) initWithDatabase:(Database *)database delegate:(id)delegate {
      if ((self = [super init])) {
          database_ = database;
          roledelegate_ = delegate;
 -
 -        [[self navigationItem] setTitle:UCLocalize("WHO_ARE_YOU")];
 -
 -        NSArray *items = [NSArray arrayWithObjects:
 -            UCLocalize("USER"),
 -            UCLocalize("HACKER"),
 -            UCLocalize("DEVELOPER"),
 -        nil];
 -        segment_ = [[UISegmentedControl alloc] initWithItems:items];
 -        container_ = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)];
 -        [container_ addSubview:segment_];
 -
 -        int index = -1;
 -        if ([Role_ isEqualToString:@"User"]) index = 0;
 -        if ([Role_ isEqualToString:@"Hacker"]) index = 1;
 -        if ([Role_ isEqualToString:@"Developer"]) index = 2;
 -        if (index != -1) {
 -            [segment_ setSelectedSegmentIndex:index];
 -            [self showDoneButton];
 -        }
 -
 -        [segment_ addTarget:self action:@selector(segmentChanged:) forControlEvents:UIControlEventValueChanged];
 -        [self resizeSegmentedControl];
 -
 -        table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
 -        [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 -        [table_ setDelegate:self];
 -        [table_ setDataSource:self];
 -        [[self view] addSubview:table_];
 -        [table_ reloadData];
      } return self;
  }
  
@@@ -8284,82 -8120,61 +8296,82 @@@
      return section == 3 ? container_ : nil;
  }
  
 +- (void) reloadData {
 +    [super reloadData];
 +    [table_ reloadData];
 +}
 +
  @end
  /* }}} */
  /* Stash Controller {{{ */
  @interface StashController : CYViewController {
 -    // XXX: just delete these things
 -    _transient UIActivityIndicatorView *spinner_;
 -    _transient UILabel *status_;
 -    _transient UILabel *caption_;
 +    UIActivityIndicatorView *spinner_;
 +    UILabel *status_;
 +    UILabel *caption_;
  }
  @end
  
  @implementation StashController
 -- (id) init {
 -    if ((self = [super init])) {
 -        [[self view] setBackgroundColor:[UIColor viewFlipsideBackgroundColor]];
  
 -        spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge] autorelease];
 -        CGRect spinrect = [spinner_ frame];
 -        spinrect.origin.x = ([[self view] frame].size.width / 2) - (spinrect.size.width / 2);
 -        spinrect.origin.y = [[self view] frame].size.height - 80.0f;
 -        [spinner_ setFrame:spinrect];
 -        [spinner_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin];
 -        [[self view] addSubview:spinner_];
 -        [spinner_ startAnimating];
 +- (void) dealloc {
 +    [self releaseSubviews];
  
 -        CGRect captrect;
 -        captrect.size.width = [[self view] frame].size.width;
 -        captrect.size.height = 40.0f;
 -        captrect.origin.x = 0;
 -        captrect.origin.y = ([[self view] frame].size.height / 2) - (captrect.size.height * 2);
 -        caption_ = [[[UILabel alloc] initWithFrame:captrect] autorelease];
 -        [caption_ setText:UCLocalize("PREPARING_FILESYSTEM")];
 -        [caption_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
 -        [caption_ setFont:[UIFont boldSystemFontOfSize:28.0f]];
 -        [caption_ setTextColor:[UIColor whiteColor]];
 -        [caption_ setBackgroundColor:[UIColor clearColor]];
 -        [caption_ setShadowColor:[UIColor blackColor]];
 -        [caption_ setTextAlignment:UITextAlignmentCenter];
 -        [[self view] addSubview:caption_];
 -
 -        CGRect statusrect;
 -        statusrect.size.width = [[self view] frame].size.width;
 -        statusrect.size.height = 30.0f;
 -        statusrect.origin.x = 0;
 -        statusrect.origin.y = ([[self view] frame].size.height / 2) - statusrect.size.height;
 -        status_ = [[[UILabel alloc] initWithFrame:statusrect] autorelease];
 -        [status_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
 -        [status_ setText:UCLocalize("EXIT_WHEN_COMPLETE")];
 -        [status_ setFont:[UIFont systemFontOfSize:16.0f]];
 -        [status_ setTextColor:[UIColor whiteColor]];
 -        [status_ setBackgroundColor:[UIColor clearColor]];
 -        [status_ setShadowColor:[UIColor blackColor]];
 -        [status_ setTextAlignment:UITextAlignmentCenter];
 -        [[self view] addSubview:status_];
 -    } return self;
 +    [super dealloc];
 +}
 +
 +- (void) loadView {
 +    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 +    [[self view] setBackgroundColor:[UIColor viewFlipsideBackgroundColor]];
 +
 +    spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge] autorelease];
 +    CGRect spinrect = [spinner_ frame];
 +    spinrect.origin.x = ([[self view] frame].size.width / 2) - (spinrect.size.width / 2);
 +    spinrect.origin.y = [[self view] frame].size.height - 80.0f;
 +    [spinner_ setFrame:spinrect];
 +    [spinner_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin];
 +    [[self view] addSubview:spinner_];
 +    [spinner_ startAnimating];
 +
 +    CGRect captrect;
 +    captrect.size.width = [[self view] frame].size.width;
 +    captrect.size.height = 40.0f;
 +    captrect.origin.x = 0;
 +    captrect.origin.y = ([[self view] frame].size.height / 2) - (captrect.size.height * 2);
 +    caption_ = [[[UILabel alloc] initWithFrame:captrect] autorelease];
 +    [caption_ setText:UCLocalize("PREPARING_FILESYSTEM")];
 +    [caption_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
 +    [caption_ setFont:[UIFont boldSystemFontOfSize:28.0f]];
 +    [caption_ setTextColor:[UIColor whiteColor]];
 +    [caption_ setBackgroundColor:[UIColor clearColor]];
 +    [caption_ setShadowColor:[UIColor blackColor]];
 +    [caption_ setTextAlignment:UITextAlignmentCenter];
 +    [[self view] addSubview:caption_];
 +
 +    CGRect statusrect;
 +    statusrect.size.width = [[self view] frame].size.width;
 +    statusrect.size.height = 30.0f;
 +    statusrect.origin.x = 0;
 +    statusrect.origin.y = ([[self view] frame].size.height / 2) - statusrect.size.height;
 +    status_ = [[[UILabel alloc] initWithFrame:statusrect] autorelease];
 +    [status_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
 +    [status_ setText:UCLocalize("EXIT_WHEN_COMPLETE")];
 +    [status_ setFont:[UIFont systemFontOfSize:16.0f]];
 +    [status_ setTextColor:[UIColor whiteColor]];
 +    [status_ setBackgroundColor:[UIColor clearColor]];
 +    [status_ setShadowColor:[UIColor blackColor]];
 +    [status_ setTextAlignment:UITextAlignmentCenter];
 +    [[self view] addSubview:status_];
 +}
 +
 +- (void) releaseSubviews {
 +    [spinner_ release];
 +    spinner_ = nil;
 +
 +    [status_ release];
 +    status_ = nil;
 +
 +    [caption_ release];
 +    caption_ = nil;
  }
  
  @end
@@@ -8733,6 -8548,41 +8745,6 @@@
      [self complete];
  }
  
 -- (void) tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController {
 -    CYNavigationController *controller = (CYNavigationController *) viewController;
 -
 -    if ([[controller viewControllers] count] == 0) {
 -        int index = [[tabbar_ viewControllers] indexOfObjectIdenticalTo:controller];
 -        CYViewController *root = nil;
 -
 -        if (index == 0)
 -            root = [[[HomeController alloc] init] autorelease];
 -        else if (index == 1)
 -            root = [[[SectionsController alloc] initWithDatabase:database_] autorelease];
 -        else if (index == 2)
 -            root = [[[ChangesController alloc] initWithDatabase:database_] autorelease];
 -
 -        if (IsWildcat_) {
 -            if (index == 3)
 -                root = [[[InstalledController alloc] initWithDatabase:database_] autorelease];
 -            else if (index == 4)
 -                root = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
 -            else if (index == 5)
 -                root = [[[SearchController alloc] initWithDatabase:database_] autorelease];
 -        } else {
 -            if (index == 3)
 -                root = [[[ManageController alloc] init] autorelease];
 -            else if (index == 4)
 -                root = [[[SearchController alloc] initWithDatabase:database_] autorelease];
 -        }
 -
 -        [root setDelegate:self];
 -
 -        if (root != nil)
 -            [controller setViewControllers:[NSArray arrayWithObject:root]];
 -    }
 -}
 -
  - (void) showSettings {
      SettingsController *role = [[[SettingsController alloc] initWithDatabase:database_ delegate:self] autorelease];
      CYNavigationController *nav = [[[CYNavigationController alloc] initWithRootViewController:role] autorelease];
@@@ -8918,10 -8768,6 +8930,10 @@@
              [(CYBrowserController *)controller loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"storage" ofType:@"html"]]];
          }
  
 +        if ([base isEqualToString:@"manage"]) {
 +            controller = [[[ManageController alloc] init] autorelease];
 +        }
 +
          if ([base isEqualToString:@"sources"]) {
              controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
          }
@@@ -9032,14 -8878,6 +9044,14 @@@
          [super applicationWillResignActive:application];
  }
  
 +- (void) applicationWillTerminate:(UIApplication *)application {
 +    [Metadata_ setObject:[tabbar_ navigationURLItems] forKey:@"InterfaceState"];
 +    [Metadata_ setObject:[NSDate date] forKey:@"LastClosed"];
 +    [Metadata_ setObject:[NSNumber numberWithInt:[tabbar_ selectedIndex]] forKey:@"InterfaceIndex"];
 +
 +    [self _saveConfig];
 +}
 +
  - (void) addStashController {
      ++locked_;
      stash_ = [[StashController alloc] init];
@@@ -9198,51 -9036,9 +9210,51 @@@ _trace()
      [self showEmulatedLoadingControllerInView:nil];
      [window_ setUserInteractionEnabled:YES];
  
 -    // Show the home page.
 -    CYNavigationController *navigation = [[tabbar_ viewControllers] objectAtIndex:0];
 -    [navigation setViewControllers:[NSArray arrayWithObject:[self pageForURL:[NSURL URLWithString:@"cydia://home"]]]];
 +    int selectedIndex = 0;
 +    NSMutableArray *items = nil;
 +
 +    bool recently = false;
 +    NSDate *closed([Metadata_ objectForKey:@"LastClosed"]);
 +    if (closed != nil) {
 +        NSTimeInterval interval([closed timeIntervalSinceNow]);
 +        // XXX: Is 15 minutes the optimal time here?
 +        if (interval <= 0 && interval > -(15*60))
 +            recently = true;
 +    }
 +
 +    if (recently && [Metadata_ objectForKey:@"InterfaceState"]) {
 +        items = [[Metadata_ objectForKey:@"InterfaceState"] mutableCopy];
 +        selectedIndex = [[Metadata_ objectForKey:@"InterfaceIndex"] intValue];
 +    } else {
 +        items = [NSMutableArray array];
 +        [items addObject:[NSArray arrayWithObject:@"cydia://home"]];
 +        [items addObject:[NSArray arrayWithObject:@"cydia://sections"]];
 +        [items addObject:[NSArray arrayWithObject:@"cydia://changes"]];
 +        if (!IsWildcat_) {
 +            [items addObject:[NSArray arrayWithObject:@"cydia://manage"]];
 +        } else {
 +            [items addObject:[NSArray arrayWithObject:@"cydia://installed"]];
 +            [items addObject:[NSArray arrayWithObject:@"cydia://sources"]];
 +        }
 +        [items addObject:[NSArray arrayWithObject:@"cydia://search"]];
 +    }
 +
 +    [tabbar_ setSelectedIndex:selectedIndex];
 +    for (unsigned int tab = 0; tab < [[tabbar_ viewControllers] count]; tab++) {
 +        NSArray *stack = [items objectAtIndex:tab];
 +        CYNavigationController *navigation = [[tabbar_ viewControllers] objectAtIndex:tab];
 +        NSMutableArray *current = [NSMutableArray array];
 +
 +        for (unsigned int nav = 0; nav < [stack count]; nav++) {
 +            NSString *addr = [stack objectAtIndex:nav];
 +            NSURL *url = [NSURL URLWithString:addr];
 +            CYViewController *page = [self pageForURL:url];
 +            if (page != nil)
 +                [current addObject:page];
 +        }
 +
 +        [navigation setViewControllers:current];
 +    }
  
      // (Try to) show the startup URL.
      if (starturl_ != nil) {
@@@ -9305,6 -9101,33 +9317,33 @@@ MSHook(void, UIHardware$_playSystemSoun
      }
  }
  
+ Class $UIApplication;
+ 
+ MSHook(void, UIApplication$_updateApplicationAccessibility, UIApplication *self, SEL _cmd) {
+     static BOOL initialized = NO;
+     static BOOL started = NO;
+ 
+     NSDictionary *dict([[[NSDictionary alloc] initWithContentsOfFile:@"/var/mobile/Library/Preferences/com.apple.Accessibility.plist"] autorelease]);
+     BOOL enabled = [[dict objectForKey:@"VoiceOverTouchEnabled"] boolValue] || [[dict objectForKey:@"VoiceOverTouchEnabledByiTunes"] boolValue];
+ 
+     if ([self respondsToSelector:@selector(_accessibilityBundlePrincipalClass)]) {
+         id bundle = [self performSelector:@selector(_accessibilityBundlePrincipalClass)];
+         if (![bundle respondsToSelector:@selector(_accessibilityStopServer)]) return;
+         if (![bundle respondsToSelector:@selector(_accessibilityStartServer)]) return;
+ 
+         if (initialized && !enabled) {
+             initialized = NO;
+             [bundle performSelector:@selector(_accessibilityStopServer)];
+         } else if (enabled) {
+             initialized = YES;
+             if (!started) {
+                 started = YES;
+                 [bundle performSelector:@selector(_accessibilityStartServer)];
+             }
+         }
+     }
+ }
+ 
  int main(int argc, char *argv[]) { _pooled
      _trace();
  
@@@ -9332,6 -9155,13 +9371,13 @@@
          _UIHardware$_playSystemSound$ = reinterpret_cast<void (*)(Class, SEL, int)>(method_getImplementation(UIHardware$_playSystemSound$));
          method_setImplementation(UIHardware$_playSystemSound$, reinterpret_cast<IMP>(&$UIHardware$_playSystemSound$));
      }
+ 
+     $UIApplication = objc_getClass("UIApplication");
+     Method UIApplication$_updateApplicationAccessibility(class_getInstanceMethod($UIApplication, @selector(_updateApplicationAccessibility)));
+     if (UIApplication$_updateApplicationAccessibility != NULL) {
+         _UIApplication$_updateApplicationAccessibility = reinterpret_cast<void (*)(UIApplication *, SEL)>(method_getImplementation(UIApplication$_updateApplicationAccessibility));
+         method_setImplementation(UIApplication$_updateApplicationAccessibility, reinterpret_cast<IMP>(&$UIApplication$_updateApplicationAccessibility));
+     }
      /* }}} */
      /* Set Locale {{{ */
      Locale_ = CFLocaleCopyCurrent();