Merge branch 'master' of git.saurik.com:cydia

diff --combined Cydia.mm
index 2638e4223f04b7d24efb02706cd8001ef721b8fe,3dfb950568fda4026a97b01ac563132f30890255..2d7b20307aaf485f2bab17f44c72c80a3adb299b
--- 1/Cydia.mm
--- 2/Cydia.mm
+++ b/Cydia.mm
@@@ -2482,11 -2482,13 +2482,13 @@@ struct PackageNameOrdering 
      UIImage *icon(nil);
      if (!icon_.empty())
          if ([icon_ hasPrefix:@"file:///"])
+             // XXX: correct escaping
              icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]];
      if (icon == nil) if (section != nil)
          icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
      if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon])
          if ([dicon hasPrefix:@"file:///"])
+             // XXX: correct escaping
              icon = [UIImage imageAtPath:[dicon substringFromIndex:7]];
      if (icon == nil)
          icon = [UIImage applicationImageNamed:@"unknown.png"];
@@@ -5227,12 -5229,9 +5229,12 @@@ bool DepSubstrate(const pkgCache::VerIt
      }
  }
  
 +// We don't want to allow non-commercial packages to do custom things to the install button,
 +// so it must call customButtonClicked with a custom commercial_ == 1 fallthrough.
  - (void) customButtonClicked {
 -    // Wait until it's done loading.
 -    if (![self isLoading])
 +    if (commercial_)
 +        [super customButtonClicked];
 +    else
          [self _customButtonClicked];
  }
  
@@@ -5243,16 -5242,6 +5245,16 @@@
  - (void) applyLoadingTitle {
      // Don't show "Loading" as the title. Ever.
  }
 +
 +- (UIBarButtonItem *) rightButton {
 +    int count = [buttons_ count];
 +    return [[[UIBarButtonItem alloc]
 +        initWithTitle:count == 0 ? nil : count != 1 ? UCLocalize("MODIFY") : [buttons_ objectAtIndex:0]
 +        style:UIBarButtonItemStylePlain
 +        target:self
 +        action:@selector(customButtonClicked)
 +    ] autorelease];
 +}
  #endif
  
  - (id) initWithDatabase:(Database *)database {
@@@ -5320,6 -5309,19 +5322,6 @@@
      }
  }
  
 -- (void) applyRightButton {
 -    int count = [buttons_ count];
 -    UIBarButtonItem *actionItem = [[UIBarButtonItem alloc]
 -        initWithTitle:count == 0 ? nil : count != 1 ? UCLocalize("MODIFY") : [buttons_ objectAtIndex:0]
 -        style:UIBarButtonItemStylePlain
 -        target:self
 -        action:@selector(customButtonClicked)
 -    ];
 -    if (![self isLoading]) [[self navigationItem] setRightBarButtonItem:actionItem];
 -    else [super applyRightButton];
 -    [actionItem release];
 -}
 -
  - (bool) isLoading {
      return commercial_ ? [super isLoading] : false;
  }