Merge branch 'master' of saurik.com:cydia

diff --combined Cydia.mm
index 973efb289aefa50ac1046edb71bbfb4c87c052f0,ad269ede6ca778fdd5025be649eb568c8b79d9aa..936856dbaf73b03ff0404e25f9f57d07f4bbb24a
--- 1/Cydia.mm
--- 2/Cydia.mm
+++ b/Cydia.mm
@@@ -384,7 -384,7 +384,7 @@@ static const CFStringCompareFlags LaxCo
  #define ShowInternals (0 && !ForRelease)
  #define IgnoreInstall (0 && !ForRelease)
  #define RecycleWebViews 0
 -#define RecyclePackageViews (1 && ForRelease)
 +#define RecyclePackageViews (0 && ForRelease)
  #define AlwaysReload (1 && !ForRelease)
  
  #if !TraceLogging
@@@ -1634,11 -1634,11 +1634,11 @@@ typedef std::map< unsigned long, _H<Sou
  }
  
  - (NSString *) depictionForPackage:(NSString *)package {
-     return depiction_.empty() ? nil : [depiction_ stringByReplacingOccurrencesOfString:@"*" withString:package];
+     return depiction_.empty() ? nil : [static_cast<id>(depiction_) stringByReplacingOccurrencesOfString:@"*" withString:package];
  }
  
  - (NSString *) supportForPackage:(NSString *)package {
-     return support_.empty() ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];
+     return support_.empty() ? nil : [static_cast<id>(support_) stringByReplacingOccurrencesOfString:@"*" withString:package];
  }
  
  - (NSDictionary *) record {
@@@ -2180,7 -2180,7 +2180,7 @@@ struct PackageNameOrdering 
          _end
  
          bool changed(false);
-         NSString *key([id_ lowercaseString]);
+         NSString *key([static_cast<id>(id_) lowercaseString]);
  
          _profile(Package$initWithVersion$Metadata)
              metadata_ = [Packages_ objectForKey:key];
@@@ -2486,9 -2486,9 +2486,9 @@@
  
      UIImage *icon(nil);
      if (!icon_.empty())
-         if ([icon_ hasPrefix:@"file:///"])
+         if ([static_cast<id>(icon_) hasPrefix:@"file:///"])
              // XXX: correct escaping
-             icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]];
+             icon = [UIImage imageAtPath:[static_cast<id>(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])
@@@ -8252,7 -8252,7 +8252,7 @@@ static _finline void _setHomePage(Cydi
      [page setDelegate:self];
  
      CYNavigationController *navController = (CYNavigationController *) [tabbar_ selectedViewController];
-     [navController setViewControllers:[NSArray arrayWithObject:page] animated:NO];
+     [navController setViewControllers:[NSArray arrayWithObject:page]];
      for (CYNavigationController *page in [tabbar_ viewControllers]) {
          if (page != navController) [page setViewControllers:nil];
      }