Add /usr/share/bigboss/icons from the bigboss package.

[cydia.git] / MobileCydia.mm

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 37d3d93be76be9df9ff760fe44a170600bf7aae2..a54c7b7332d8ca6b3cd27b36c394c8b937ba8840 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -120,18 +120,20 @@ extern "C" {
 
 #include <Cytore.hpp>
 
 
 #include <Cytore.hpp>
 

+#include <CydiaSubstrate/CydiaSubstrate.h>

 #include "Menes/Menes.h"
 
 #include "CyteKit/PerlCompatibleRegEx.hpp"
 #include "Menes/Menes.h"
 
 #include "CyteKit/PerlCompatibleRegEx.hpp"

+#include "CyteKit/TableViewCell.h"

 #include "CyteKit/WebScriptObject-Cyte.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/stringWithUTF8Bytes.h"
 
 #include "CyteKit/WebScriptObject-Cyte.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/stringWithUTF8Bytes.h"
 

+#include "Cydia/MIMEAddress.h"
+#include "Cydia/LoadingViewController.h"

 #include "Cydia/ProgressEvent.h"
 
 #include "SDURLCache/SDURLCache.h"
 #include "Cydia/ProgressEvent.h"
 
 #include "SDURLCache/SDURLCache.h"

-
-#include <CydiaSubstrate/CydiaSubstrate.h>

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


@@ -204,15 +206,7 @@ void PrintTimes() {
 #define _end }
 /* }}} */
 
 #define _end }
 /* }}} */
 

-#define _pooled _H<NSAutoreleasePool> _pool([[NSAutoreleasePool alloc] init], true);
-
-#define CYPoolStart() \
-    NSAutoreleasePool *_pool([[NSAutoreleasePool alloc] init]); \
-    do
-#define CYPoolEnd() \
-    while (false); \
-    [_pool release];
-
+#include "Version.h"

 #define Cydia_ CYDIA_VERSION
 
 #define lprintf(args...) fprintf(stderr, args)
 #define Cydia_ CYDIA_VERSION
 
 #define lprintf(args...) fprintf(stderr, args)


@@ -251,6 +245,11 @@ union SplitHash {
 };
 // }}}
 
 };
 // }}}
 

+static NSString *Colon_;
+NSString *Elision_;
+static NSString *Error_;
+static NSString *Warning_;
+

 static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
 
 static _finline NSString *CydiaURL(NSString *path) {
 static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
 
 static _finline NSString *CydiaURL(NSString *path) {


@@ -273,88 +272,16 @@ static _finline void UpdateExternalStatus(uint64_t newStatus) {
     notify_post("com.saurik.Cydia.status");
 }
 
     notify_post("com.saurik.Cydia.status");
 }
 

+static CGFloat CYStatusBarHeight(UIInterfaceOrientation orientation) {
+    CGSize size([[UIApplication sharedApplication] statusBarFrame].size);
+    return UIInterfaceOrientationIsPortrait(orientation) ? size.height : size.width;
+}
+

 /* NSForcedOrderingSearch doesn't work on the iPhone */
 static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch;
 static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch;
 static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareLocalized | kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
 
 /* NSForcedOrderingSearch doesn't work on the iPhone */
 static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch;
 static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch;
 static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareLocalized | kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
 

-/* Radix Sort {{{ */
-typedef uint32_t (*SKRadixFunction)(id, void *);
-
-@interface NSMutableArray (Radix)
-- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument;
-@end
-
-struct RadixItem_ {
-    size_t index;
-    uint32_t key;
-};
-
-@implementation NSMutableArray (Radix)
-
-- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument {
-    size_t count([self count]);
-    struct RadixItem_ *swap(new RadixItem_[count * 2]);
-
-    for (size_t i(0); i != count; ++i) {
-        RadixItem_ &item(swap[i]);
-        item.index = i;
-
-        id object([self objectAtIndex:i]);
-        item.key = function(object, argument);
-    }
-
-    struct RadixItem_ *lhs(swap), *rhs(swap + count);
-
-    static const size_t width = 32;
-    static const size_t bits = 11;
-    static const size_t slots = 1 << bits;
-    static const size_t passes = (width + (bits - 1)) / bits;
-
-    size_t *hist(new size_t[slots]);
-
-    for (size_t pass(0); pass != passes; ++pass) {
-        memset(hist, 0, sizeof(size_t) * slots);
-
-        for (size_t i(0); i != count; ++i) {
-            uint32_t key(lhs[i].key);
-            key >>= pass * bits;
-            key &= _not(uint32_t) >> width - bits;
-            ++hist[key];
-        }
-
-        size_t offset(0);
-        for (size_t i(0); i != slots; ++i) {
-            size_t local(offset);
-            offset += hist[i];
-            hist[i] = local;
-        }
-
-        for (size_t i(0); i != count; ++i) {
-            uint32_t key(lhs[i].key);
-            key >>= pass * bits;
-            key &= _not(uint32_t) >> width - bits;
-            rhs[hist[key]++] = lhs[i];
-        }
-
-        RadixItem_ *tmp(lhs);
-        lhs = rhs;
-        rhs = tmp;
-    }
-
-    delete [] hist;
-
-    const void **values(new const void *[count]);
-    for (size_t i(0); i != count; ++i)
-        values[i] = [self objectAtIndex:lhs[i].index];
-    CFArrayReplaceValues((CFMutableArrayRef) self, CFRangeMake(0, count), values, count);
-    delete [] values;
-
-    delete [] swap;
-}
-
-@end
-/* }}} */

 /* Insertion Sort {{{ */
 
 CFIndex SKBSearch_(const void *element, CFIndex elementSize, const void *list, CFIndex count, CFComparatorFunction comparator, void *context) {
 /* Insertion Sort {{{ */
 
 CFIndex SKBSearch_(const void *element, CFIndex elementSize, const void *list, CFIndex count, CFComparatorFunction comparator, void *context) {


@@ -674,86 +601,6 @@ struct NSStringMapEqual :
 };
 /* }}} */
 
 };
 /* }}} */
 

-/* Mime Addresses {{{ */
-@interface Address : NSObject {
-    NSString *name_;
-    NSString *address_;
-}
-
-- (NSString *) name;
-- (NSString *) address;
-
-- (void) setAddress:(NSString *)address;
-
-+ (Address *) addressWithString:(NSString *)string;
-- (Address *) initWithString:(NSString *)string;
-
-@end
-
-@implementation Address
-
-- (void) dealloc {
-    [name_ release];
-    if (address_ != nil)
-        [address_ release];
-    [super dealloc];
-}
-
-- (NSString *) name {
-    return name_;
-}
-
-- (NSString *) address {
-    return address_;
-}
-
-- (void) setAddress:(NSString *)address {
-    if (address_ != nil)
-        [address_ autorelease];
-    if (address == nil)
-        address_ = nil;
-    else
-        address_ = [address retain];
-}
-
-+ (Address *) addressWithString:(NSString *)string {
-    return [[[Address alloc] initWithString:string] autorelease];
-}
-
-+ (NSArray *) _attributeKeys {
-    return [NSArray arrayWithObjects:
-        @"address",
-        @"name",
-    nil];
-}
-
-- (NSArray *) attributeKeys {
-    return [[self class] _attributeKeys];
-}
-
-+ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
-    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
-}
-
-- (Address *) initWithString:(NSString *)string {
-    if ((self = [super init]) != nil) {
-        const char *data = [string UTF8String];
-        size_t size = [string length];
-
-        static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
-
-        if (address_r(data, size)) {
-            name_ = [address_r[1] retain];
-            address_ = [address_r[2] retain];
-        } else {
-            name_ = [string retain];
-            address_ = nil;
-        }
-    } return self;
-}
-
-@end
-/* }}} */

 /* CoreGraphics Primitives {{{ */
 class CYColor {
   private:
 /* CoreGraphics Primitives {{{ */
 class CYColor {
   private:


@@ -828,11 +675,11 @@ static NSString *App_;
 static BOOL Advanced_;
 static BOOL Ignored_;
 
 static BOOL Advanced_;
 static BOOL Ignored_;
 

-static UIFont *Font12_;
-static UIFont *Font12Bold_;
-static UIFont *Font14_;
-static UIFont *Font18Bold_;
-static UIFont *Font22Bold_;
+static _H<UIFont> Font12_;
+static _H<UIFont> Font12Bold_;
+static _H<UIFont> Font14_;
+static _H<UIFont> Font18Bold_;
+static _H<UIFont> Font22Bold_;

 
 static const char *Machine_ = NULL;
 static NSString *System_ = nil;
 
 static const char *Machine_ = NULL;
 static NSString *System_ = nil;


@@ -855,8 +702,11 @@ static NSMutableDictionary *Metadata_;
 static _transient NSMutableDictionary *Settings_;
 static _transient NSString *Role_;
 static _transient NSMutableDictionary *Packages_;
 static _transient NSMutableDictionary *Settings_;
 static _transient NSString *Role_;
 static _transient NSMutableDictionary *Packages_;

+static _transient NSMutableDictionary *Values_;

 static _transient NSMutableDictionary *Sections_;
 static _transient NSMutableDictionary *Sources_;
 static _transient NSMutableDictionary *Sections_;
 static _transient NSMutableDictionary *Sources_;

+static _transient NSNumber *Version_;
+static _transient _H<NSString> CydiaSource_;

 static bool Changed_;
 static time_t now_;
 
 static bool Changed_;
 static time_t now_;
 


@@ -864,10 +714,13 @@ bool IsWildcat_;
 static CGFloat ScreenScale_;
 static NSString *Idiom_;
 
 static CGFloat ScreenScale_;
 static NSString *Idiom_;
 

-static NSMutableDictionary *SessionData_;
-static NSObject *HostConfig_;
-static NSMutableSet *BridgedHosts_;
-static NSMutableSet *PipelinedHosts_;
+static _H<NSMutableDictionary> SessionData_;
+static _H<NSObject> HostConfig_;
+static _H<NSMutableSet> BridgedHosts_;
+static _H<NSMutableSet> TokenHosts_;
+static _H<NSMutableSet> InsecureHosts_;
+static _H<NSMutableSet> PipelinedHosts_;
+static _H<NSMutableSet> CachedURLs_;

 
 static NSString *kCydiaProgressEventTypeError = @"Error";
 static NSString *kCydiaProgressEventTypeInformation = @"Information";
 
 static NSString *kCydiaProgressEventTypeError = @"Error";
 static NSString *kCydiaProgressEventTypeInformation = @"Information";


@@ -875,6 +728,45 @@ static NSString *kCydiaProgressEventTypeStatus = @"Status";
 static NSString *kCydiaProgressEventTypeWarning = @"Warning";
 /* }}} */
 
 static NSString *kCydiaProgressEventTypeWarning = @"Warning";
 /* }}} */
 

+static void AddSource(NSDictionary *source) {
+    [Sources_ setObject:source forKey:[NSString stringWithFormat:@"%@:%@:%@", [source objectForKey:@"Type"], [source objectForKey:@"URI"], [source objectForKey:@"Distribution"]]];
+    Changed_ = true;
+}
+
+static void AddSource(NSString *href, NSString *distribution, NSArray *sections = nil) {
+    AddSource([NSMutableDictionary dictionaryWithObjectsAndKeys:
+        @"deb", @"Type",
+        href, @"URI",
+        distribution, @"Distribution",
+        sections ?: [NSMutableArray array], @"Sections",
+    nil]);
+}
+
+static void WriteSources() {
+    FILE *file(fopen("/etc/apt/sources.list.d/cydia.list", "w"));
+    _assert(file != NULL);
+
+    fprintf(file, "deb http://%s/ tangelo-3.7 main\n",
+        [CydiaSource_ UTF8String]
+    );
+
+    for (NSString *key in [Sources_ allKeys]) {
+        NSDictionary *source([Sources_ objectForKey:key]);
+
+        NSArray *sections([source objectForKey:@"Sections"] ?: [NSArray array]);
+
+        fprintf(file, "%s %s %s%s%s\n",
+            [[source objectForKey:@"Type"] UTF8String],
+            [[source objectForKey:@"URI"] UTF8String],
+            [[source objectForKey:@"Distribution"] UTF8String],
+            [sections count] == 0 ? "" : " ",
+            [[sections componentsJoinedByString:@" "] UTF8String]
+        );
+    }
+
+    fclose(file);
+}
+

 /* Display Helpers {{{ */
 inline float Interpolate(float begin, float end, float fraction) {
     return (end - begin) * fraction + begin;
 /* Display Helpers {{{ */
 inline float Interpolate(float begin, float end, float fraction) {
     return (end - begin) * fraction + begin;


@@ -940,7 +832,7 @@ bool isSectionVisible(NSString *section) {
     return hidden == nil || ![hidden boolValue];
 }
 
     return hidden == nil || ![hidden boolValue];
 }
 

-static id CYIOGetValue(const char *path, NSString *property) {
+static NSObject *CYIOGetValue(const char *path, NSString *property) {

     io_registry_entry_t entry(IORegistryEntryFromPath(kIOMasterPortDefault, path));
     if (entry == MACH_PORT_NULL)
         return nil;
     io_registry_entry_t entry(IORegistryEntryFromPath(kIOMasterPortDefault, path));
     if (entry == MACH_PORT_NULL)
         return nil;


@@ -953,7 +845,7 @@ static id CYIOGetValue(const char *path, NSString *property) {
     return [(id) value autorelease];
 }
 
     return [(id) value autorelease];
 }
 

-static NSString *CYHex(NSData *data, bool reverse, bool capital) {
+static NSString *CYHex(NSData *data, bool reverse = false) {

     if (data == nil)
         return nil;
 
     if (data == nil)
         return nil;
 


@@ -963,7 +855,7 @@ static NSString *CYHex(NSData *data, bool reverse, bool capital) {
 
     char string[length * 2 + 1];
     for (size_t i(0); i != length; ++i)
 
     char string[length * 2 + 1];
     for (size_t i(0); i != length; ++i)

-        sprintf(string + i * 2, capital ? "%.2X" : "%.2x", bytes[reverse ? length - i - 1 : i]);
+        sprintf(string + i * 2, "%.2x", bytes[reverse ? length - i - 1 : i]);

 
     return [NSString stringWithUTF8String:string];
 }
 
     return [NSString stringWithUTF8String:string];
 }


@@ -984,6 +876,8 @@ static NSString *CYHex(NSData *data, bool reverse, bool capital) {
 @class CYPackageController;
 
 @protocol CydiaDelegate
 @class CYPackageController;
 
 @protocol CydiaDelegate

+- (void) returnToCydia;
+- (void) saveState;

 - (void) retainNetworkActivityIndicator;
 - (void) releaseNetworkActivityIndicator;
 - (void) clearPackage:(Package *)package;
 - (void) retainNetworkActivityIndicator;
 - (void) releaseNetworkActivityIndicator;
 - (void) clearPackage:(Package *)package;


@@ -996,6 +890,7 @@ static NSString *CYHex(NSData *data, bool reverse, bool capital) {
 - (void) loadData;
 - (void) updateData;
 - (void) syncData;
 - (void) loadData;
 - (void) updateData;
 - (void) syncData;

+- (void) addSource:(NSDictionary *)source;

 - (void) addTrivialSource:(NSString *)href;
 - (void) showSettings;
 - (UIProgressHUD *) addProgressHUD;
 - (void) addTrivialSource:(NSString *)href;
 - (void) showSettings;
 - (UIProgressHUD *) addProgressHUD;


@@ -1034,6 +929,7 @@ class Status :
     }
 
     virtual void IMSHit(pkgAcquire::ItemDesc &item) {
     }
 
     virtual void IMSHit(pkgAcquire::ItemDesc &item) {

+        Done(item);

     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {


@@ -1043,6 +939,9 @@ class Status :
     }
 
     virtual void Done(pkgAcquire::ItemDesc &item) {
     }
 
     virtual void Done(pkgAcquire::ItemDesc &item) {

+        NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
+        CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:Colon_, UCLocalize("DONE"), name] ofType:kCydiaProgressEventTypeStatus forItem:item]);
+        [delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];

     }
 
     virtual void Fail(pkgAcquire::ItemDesc &item) {
     }
 
     virtual void Fail(pkgAcquire::ItemDesc &item) {


@@ -1119,7 +1018,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
     pkgSourceList *list_;
 
     SourceMap sourceMap_;
     pkgSourceList *list_;
 
     SourceMap sourceMap_;

-    NSMutableArray *sourceList_;
+    _H<NSMutableArray> sourceList_;

 
     CFMutableArrayRef packages_;
 
 
     CFMutableArrayRef packages_;
 


@@ -1426,6 +1325,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
     CYString uri_;
     CYString distribution_;
     CYString type_;
     CYString uri_;
     CYString distribution_;
     CYString type_;

+    CYString base_;

     CYString version_;
 
     _H<NSString> host_;
     CYString version_;
 
     _H<NSString> host_;


@@ -1450,6 +1350,9 @@ static void PackageImport(const void *key, const void *value, void *context) {
 - (NSString *) uri;
 - (NSString *) distribution;
 - (NSString *) type;
 - (NSString *) uri;
 - (NSString *) distribution;
 - (NSString *) type;

+
+- (NSString *) base;
+

 - (NSString *) key;
 - (NSString *) host;
 
 - (NSString *) key;
 - (NSString *) host;
 


@@ -1470,6 +1373,8 @@ static void PackageImport(const void *key, const void *value, void *context) {
     distribution_.clear();
     type_.clear();
 
     distribution_.clear();
     type_.clear();
 

+    base_.clear();
+

     description_.clear();
     label_.clear();
     origin_.clear();
     description_.clear();
     label_.clear();
     origin_.clear();


@@ -1483,10 +1388,20 @@ static void PackageImport(const void *key, const void *value, void *context) {
     authority_ = nil;
 }
 
     authority_ = nil;
 }
 

-- (void) dealloc {
-    // XXX: this is a very inefficient way to call these deconstructors
-    [self _clear];
-    [super dealloc];
++ (NSString *) webScriptNameForSelector:(SEL)selector {
+    if (false);
+    else if (selector == @selector(addSection:))
+        return @"addSection";
+    else if (selector == @selector(removeSection:))
+        return @"removeSection";
+    else if (selector == @selector(remove))
+        return @"remove";
+    else
+        return nil;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return [self webScriptNameForSelector:selector] == nil;

 }
 
 + (NSArray *) _attributeKeys {
 }
 
 + (NSArray *) _attributeKeys {


@@ -1497,6 +1412,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
         @"label",
         @"name",
         @"origin",
         @"label",
         @"name",
         @"origin",

+        @"sections",

         @"shortDescription",
         @"trusted",
         @"type",
         @"shortDescription",
         @"trusted",
         @"type",


@@ -1524,6 +1440,8 @@ static void PackageImport(const void *key, const void *value, void *context) {
 
     debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
     if (dindex != NULL) {
 
     debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
     if (dindex != NULL) {

+        base_.set(pool, dindex->MetaIndexURI(""));
+

         FileFd fd;
         if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly))
             _error->Discard();
         FileFd fd;
         if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly))
             _error->Discard();


@@ -1566,8 +1484,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
         host_ = [host_ lowercaseString];
 
     if (host_ != nil)
         host_ = [host_ lowercaseString];
 
     if (host_ != nil)

-        // XXX: this is due to a bug in _H<>
-        authority_ = (id) host_;
+        authority_ = host_;

     else
         authority_ = [url path];
 }
     else
         authority_ = [url path];
 }


@@ -1582,7 +1499,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
     NSDictionary *lhr = [self record];
     NSDictionary *rhr = [source record];
 
     NSDictionary *lhr = [self record];
     NSDictionary *rhr = [source record];
 

-    if (lhr != rhr)
+    if ((lhr == nil) != (rhr == nil))

         return lhr == nil ? NSOrderedDescending : NSOrderedAscending;
 
     NSString *lhs = [self name];
         return lhr == nil ? NSOrderedDescending : NSOrderedAscending;
 
     NSString *lhs = [self name];


@@ -1609,6 +1526,62 @@ static void PackageImport(const void *key, const void *value, void *context) {
     return support_.empty() ? nil : [static_cast<id>(support_) stringByReplacingOccurrencesOfString:@"*" withString:package];
 }
 
     return support_.empty() ? nil : [static_cast<id>(support_) stringByReplacingOccurrencesOfString:@"*" withString:package];
 }
 

+- (NSArray *) sections {
+    return record_ == nil ? (id) [NSNull null] : [record_ objectForKey:@"Sections"] ?: [NSArray array];
+}
+
+- (void) _addSection:(NSString *)section {
+    if (record_ == nil)
+        return;
+    else if (NSMutableArray *sections = [record_ objectForKey:@"Sections"]) {
+        if (![sections containsObject:section]) {
+            [sections addObject:section];
+            Changed_ = true;
+        }
+    } else {
+        [record_ setObject:[NSMutableArray arrayWithObject:section] forKey:@"Sections"];
+        Changed_ = true;
+    }
+}
+
+- (bool) addSection:(NSString *)section {
+    if (record_ == nil)
+        return false;
+
+    [self performSelectorOnMainThread:@selector(_addSection:) withObject:section waitUntilDone:NO];
+    return true;
+}
+
+- (void) _removeSection:(NSString *)section {
+    if (record_ == nil)
+        return;
+
+    if (NSMutableArray *sections = [record_ objectForKey:@"Sections"])
+        if ([sections containsObject:section]) {
+            [sections removeObject:section];
+            Changed_ = true;
+        }
+}
+
+- (bool) removeSection:(NSString *)section {
+    if (record_ == nil)
+        return false;
+
+    [self performSelectorOnMainThread:@selector(_removeSection:) withObject:section waitUntilDone:NO];
+    return true;
+}
+
+- (void) _remove {
+    [Sources_ removeObjectForKey:[self key]];
+    Changed_ = true;
+}
+
+- (bool) remove {
+    bool value(record_ != nil);
+    [self performSelectorOnMainThread:@selector(_remove) withObject:nil waitUntilDone:NO];
+    return value;
+}
+

 - (NSDictionary *) record {
     return record_;
 }
 - (NSDictionary *) record {
     return record_;
 }


@@ -1629,6 +1602,10 @@ static void PackageImport(const void *key, const void *value, void *context) {
     return type_;
 }
 
     return type_;
 }
 

+- (NSString *) base {
+    return base_;
+}
+

 - (NSString *) key {
     return [NSString stringWithFormat:@"%@:%@:%@", (NSString *) type_, (NSString *) uri_, (NSString *) distribution_];
 }
 - (NSString *) key {
     return [NSString stringWithFormat:@"%@:%@:%@", (NSString *) type_, (NSString *) uri_, (NSString *) distribution_];
 }


@@ -1665,8 +1642,8 @@ static void PackageImport(const void *key, const void *value, void *context) {
 /* }}} */
 /* CydiaOperation Class {{{ */
 @interface CydiaOperation : NSObject {
 /* }}} */
 /* CydiaOperation Class {{{ */
 @interface CydiaOperation : NSObject {

-    NSString *operator_;
-    NSString *value_;
+    _H<NSString> operator_;
+    _H<NSString> value_;

 }
 
 - (NSString *) operator;
 }
 
 - (NSString *) operator;


@@ -1676,16 +1653,10 @@ static void PackageImport(const void *key, const void *value, void *context) {
 
 @implementation CydiaOperation
 
 
 @implementation CydiaOperation
 

-- (void) dealloc {
-    [operator_ release];
-    [value_ release];
-    [super dealloc];
-}
-

 - (id) initWithOperator:(const char *)_operator value:(const char *)value {
     if ((self = [super init]) != nil) {
 - (id) initWithOperator:(const char *)_operator value:(const char *)value {
     if ((self = [super init]) != nil) {

-        operator_ = [[NSString alloc] initWithUTF8String:_operator];
-        value_ = [[NSString alloc] initWithUTF8String:value];
+        operator_ = [NSString stringWithUTF8String:_operator];
+        value_ = [NSString stringWithUTF8String:value];

     } return self;
 }
 
     } return self;
 }
 


@@ -1716,8 +1687,8 @@ static void PackageImport(const void *key, const void *value, void *context) {
 /* }}} */
 /* CydiaClause Class {{{ */
 @interface CydiaClause : NSObject {
 /* }}} */
 /* CydiaClause Class {{{ */
 @interface CydiaClause : NSObject {

-    NSString *package_;
-    CydiaOperation *version_;
+    _H<NSString> package_;
+    _H<CydiaOperation> version_;

 }
 
 - (NSString *) package;
 }
 
 - (NSString *) package;


@@ -1727,20 +1698,14 @@ static void PackageImport(const void *key, const void *value, void *context) {
 
 @implementation CydiaClause
 
 
 @implementation CydiaClause
 

-- (void) dealloc {
-    [package_ release];
-    [version_ release];
-    [super dealloc];
-}
-

 - (id) initWithIterator:(pkgCache::DepIterator &)dep {
     if ((self = [super init]) != nil) {
 - (id) initWithIterator:(pkgCache::DepIterator &)dep {
     if ((self = [super init]) != nil) {

-        package_ = [[NSString alloc] initWithUTF8String:dep.TargetPkg().Name()];
+        package_ = [NSString stringWithUTF8String:dep.TargetPkg().Name()];

 
         if (const char *version = dep.TargetVer())
 
         if (const char *version = dep.TargetVer())

-            version_ = [[CydiaOperation alloc] initWithOperator:dep.CompType() value:version];
+            version_ = [[[CydiaOperation alloc] initWithOperator:dep.CompType() value:version] autorelease];

         else
         else

-            version_ = [[NSNull null] retain];
+            version_ = (id) [NSNull null];

     } return self;
 }
 
     } return self;
 }
 


@@ -1771,8 +1736,8 @@ static void PackageImport(const void *key, const void *value, void *context) {
 /* }}} */
 /* CydiaRelation Class {{{ */
 @interface CydiaRelation : NSObject {
 /* }}} */
 /* CydiaRelation Class {{{ */
 @interface CydiaRelation : NSObject {

-    NSString *relationship_;
-    NSMutableArray *clauses_;
+    _H<NSString> relationship_;
+    _H<NSMutableArray> clauses_;

 }
 
 - (NSString *) relationship;
 }
 
 - (NSString *) relationship;


@@ -1782,16 +1747,10 @@ static void PackageImport(const void *key, const void *value, void *context) {
 
 @implementation CydiaRelation
 
 
 @implementation CydiaRelation
 

-- (void) dealloc {
-    [relationship_ release];
-    [clauses_ release];
-    [super dealloc];
-}
-

 - (id) initWithIterator:(pkgCache::DepIterator &)dep {
     if ((self = [super init]) != nil) {
 - (id) initWithIterator:(pkgCache::DepIterator &)dep {
     if ((self = [super init]) != nil) {

-        relationship_ = [[NSString alloc] initWithUTF8String:dep.DepType()];
-        clauses_ = [[NSMutableArray alloc] initWithCapacity:8];
+        relationship_ = [NSString stringWithUTF8String:dep.DepType()];
+        clauses_ = [NSMutableArray arrayWithCapacity:8];

 
         pkgCache::DepIterator start;
         pkgCache::DepIterator end;
 
         pkgCache::DepIterator start;
         pkgCache::DepIterator end;


@@ -1841,6 +1800,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
 struct ParsedPackage {
     CYString tagline_;
 
 struct ParsedPackage {
     CYString tagline_;
 

+    CYString architecture_;

     CYString icon_;
 
     CYString depiction_;
     CYString icon_;
 
     CYString depiction_;


@@ -1862,6 +1822,8 @@ struct ParsedPackage {
 
     apr_pool_t *pool_;
 
 
     apr_pool_t *pool_;
 

+    uint32_t rank_;
+

     _transient Database *database_;
 
     pkgCache::VerIterator version_;
     _transient Database *database_;
 
     pkgCache::VerIterator version_;


@@ -1877,12 +1839,12 @@ struct ParsedPackage {
     const char *section_;
     _transient NSString *section$_;
 
     const char *section_;
     _transient NSString *section$_;
 

-    Source *source_;
+    _H<Source> source_;

 
     PackageValue *metadata_;
     ParsedPackage *parsed_;
 
 
     PackageValue *metadata_;
     ParsedPackage *parsed_;
 

-    NSMutableArray *tags_;
+    _H<NSMutableArray> tags_;

 }
 
 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
 }
 
 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;


@@ -1899,7 +1861,7 @@ struct ParsedPackage {
 
 - (NSString *) uri;
 
 
 - (NSString *) uri;
 

-- (Address *) maintainer;
+- (MIMEAddress *) maintainer;

 - (size_t) size;
 - (NSString *) longDescription;
 - (NSString *) shortDescription;
 - (size_t) size;
 - (NSString *) longDescription;
 - (NSString *) shortDescription;


@@ -1935,7 +1897,7 @@ struct ParsedPackage {
 - (UIImage *) icon;
 - (NSString *) homepage;
 - (NSString *) depiction;
 - (UIImage *) icon;
 - (NSString *) homepage;
 - (NSString *) depiction;

-- (Address *) author;
+- (MIMEAddress *) author;

 
 - (NSString *) support;
 
 
 - (NSString *) support;
 


@@ -1945,7 +1907,8 @@ struct ParsedPackage {
 
 - (Source *) source;
 
 
 - (Source *) source;
 

-- (BOOL) matches:(NSString *)text;
+- (uint32_t) rank;
+- (BOOL) matches:(NSArray *)query;

 
 - (bool) hasSupportingRole;
 - (BOOL) hasTag:(NSString *)tag;
 
 - (bool) hasSupportingRole;
 - (BOOL) hasTag:(NSString *)tag;


@@ -1962,7 +1925,7 @@ struct ParsedPackage {
 - (void) install;
 - (void) remove;
 
 - (void) install;
 - (void) remove;
 

-- (bool) isUnfilteredAndSearchedForBy:(NSString *)search;
+- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query;

 - (bool) isUnfilteredAndSelectedForBy:(NSString *)search;
 - (bool) isInstalledAndUnfiltered:(NSNumber *)number;
 - (bool) isVisibleInSection:(NSString *)section;
 - (bool) isUnfilteredAndSelectedForBy:(NSString *)search;
 - (bool) isInstalledAndUnfiltered:(NSNumber *)number;
 - (bool) isVisibleInSection:(NSString *)section;


@@ -2104,10 +2067,6 @@ struct PackageNameOrdering :
 - (void) dealloc {
     if (parsed_ != NULL)
         delete parsed_;
 - (void) dealloc {
     if (parsed_ != NULL)
         delete parsed_;

-    if (source_ != nil)
-        [source_ release];
-    if (tags_ != nil)
-        [tags_ release];

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


@@ -2134,6 +2093,7 @@ struct PackageNameOrdering :
 + (NSArray *) _attributeKeys {
     return [NSArray arrayWithObjects:
         @"applications",
 + (NSArray *) _attributeKeys {
     return [NSArray arrayWithObjects:
         @"applications",

+        @"architecture",

         @"author",
         @"depiction",
         @"essential",
         @"author",
         @"depiction",
         @"essential",


@@ -2180,6 +2140,12 @@ struct PackageNameOrdering :
     return relations;
 } }
 
     return relations;
 } }
 

+- (NSString *) architecture {
+    [self parse];
+@synchronized (database_) {
+    return parsed_->architecture_.empty() ? [NSNull null] : (id) parsed_->architecture_;
+} }
+

 - (NSString *) getField:(NSString *)name {
 @synchronized (database_) {
     if ([database_ era] != era_ || file_.end())
 - (NSString *) getField:(NSString *)name {
 @synchronized (database_) {
     if ([database_ era] != era_ || file_.end())


@@ -2218,6 +2184,7 @@ struct PackageNameOrdering :
                 const char *name_;
                 CYString *value_;
             } names[] = {
                 const char *name_;
                 CYString *value_;
             } names[] = {

+                {"architecture", &parsed->architecture_},

                 {"icon", &parsed->icon_},
                 {"depiction", &parsed->depiction_},
                 {"homepage", &parsed->homepage_},
                 {"icon", &parsed->icon_},
                 {"depiction", &parsed->depiction_},
                 {"homepage", &parsed->homepage_},


@@ -2296,7 +2263,7 @@ struct PackageNameOrdering :
         _profile(Package$initWithVersion$Tags)
             pkgCache::TagIterator tag(iterator.TagList());
             if (!tag.end()) {
         _profile(Package$initWithVersion$Tags)
             pkgCache::TagIterator tag(iterator.TagList());
             if (!tag.end()) {

-                tags_ = [[NSMutableArray alloc] initWithCapacity:8];
+                tags_ = [NSMutableArray arrayWithCapacity:8];

                 do {
                     const char *name(tag.Name());
                     [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];
                 do {
                     const char *name(tag.Name());
                     [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];


@@ -2445,14 +2412,14 @@ struct PackageNameOrdering :
 #endif
 }
 
 #endif
 }
 

-- (Address *) maintainer {
+- (MIMEAddress *) maintainer {

 @synchronized (database_) {
     if ([database_ era] != era_ || file_.end())
         return nil;
 
     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
     const std::string &maintainer(parser->Maintainer());
 @synchronized (database_) {
     if ([database_ era] != era_ || file_.end())
         return nil;
 
     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
     const std::string &maintainer(parser->Maintainer());

-    return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];
+    return maintainer.empty() ? nil : [MIMEAddress addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];

 } }
 
 - (size_t) size {
 } }
 
 - (size_t) size {


@@ -2486,8 +2453,29 @@ struct PackageNameOrdering :
 } }
 
 - (NSString *) shortDescription {
 } }
 
 - (NSString *) shortDescription {

-    return parsed_ == NULL ? nil : static_cast<NSString *>(parsed_->tagline_);
-}
+    if (parsed_ != NULL)
+        return static_cast<NSString *>(parsed_->tagline_);
+
+@synchronized (database_) {
+    pkgRecords::Parser &parser([database_ records]->Lookup(file_));
+
+    const char *start, *end;
+    if (!parser.ShortDesc(start, end))
+        return nil;
+
+    if (end - start > 200)
+        end = start + 200;
+
+    /*
+    if (const char *stop = reinterpret_cast<const char *>(memchr(start, '\n', end - start)))
+        end = stop;
+
+    while (end != start && end[-1] == '\r')
+        --end;
+    */
+
+    return [(id) CYStringCreate(start, end - start) autorelease];
+} }

 
 - (unichar) index {
     _profile(Package$index)
 
 - (unichar) index {
     _profile(Package$index)


@@ -2659,14 +2647,12 @@ struct PackageNameOrdering :
     if (parsed_ != NULL)
         if (NSString *href = parsed_->icon_)
             if ([href hasPrefix:@"file:///"])
     if (parsed_ != NULL)
         if (NSString *href = parsed_->icon_)
             if ([href hasPrefix:@"file:///"])

-                // XXX: correct escaping
-                icon = [UIImage imageAtPath:[href substringFromIndex:7]];
+                icon = [UIImage imageAtPath:[[href substringFromIndex:7] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];

     if (icon == nil) if (section != nil)
     if (icon == nil) if (section != nil)

-        icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
+        icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, [section stringByReplacingOccurrencesOfString:@" " withString:@"_"]]];

     if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon])
         if ([dicon hasPrefix:@"file:///"])
     if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon])
         if ([dicon hasPrefix:@"file:///"])

-            // XXX: correct escaping
-            icon = [UIImage imageAtPath:[dicon substringFromIndex:7]];
+            icon = [UIImage imageAtPath:[[dicon substringFromIndex:7] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];

     if (icon == nil)
         icon = [UIImage applicationImageNamed:@"unknown.png"];
     return icon;
     if (icon == nil)
         icon = [UIImage applicationImageNamed:@"unknown.png"];
     return icon;


@@ -2680,12 +2666,12 @@ struct PackageNameOrdering :
     return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_];
 }
 
     return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_];
 }
 

-- (Address *) sponsor {
-    return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [Address addressWithString:parsed_->sponsor_];
+- (MIMEAddress *) sponsor {
+    return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [MIMEAddress addressWithString:parsed_->sponsor_];

 }
 
 }
 

-- (Address *) author {
-    return parsed_ == NULL || parsed_->author_.empty() ? nil : [Address addressWithString:parsed_->author_];
+- (MIMEAddress *) author {
+    return parsed_ == NULL || parsed_->author_.empty() ? nil : [MIMEAddress addressWithString:parsed_->author_];

 }
 
 - (NSString *) support {
 }
 
 - (NSString *) support {


@@ -2846,37 +2832,58 @@ struct PackageNameOrdering :
             if ([database_ era] != era_ || file_.end())
                 source_ = (Source *) [NSNull null];
             else
             if ([database_ era] != era_ || file_.end())
                 source_ = (Source *) [NSNull null];
             else

-                source_ = [([database_ getSource:file_.File()] ?: (Source *) [NSNull null]) retain];
+                source_ = [database_ getSource:file_.File()] ?: (Source *) [NSNull null];

         }
     }
 
     return source_ == (Source *) [NSNull null] ? nil : source_;
 }
 
         }
     }
 
     return source_ == (Source *) [NSNull null] ? nil : source_;
 }
 

-- (BOOL) matches:(NSString *)text {
-    if (text == nil)
+- (uint32_t) rank {
+    return rank_;
+}
+
+- (BOOL) matches:(NSArray *)query {
+    if (query == nil || [query count] == 0)

         return NO;
 
         return NO;
 

+    rank_ = 0;
+
+    NSString *string;

     NSRange range;
     NSRange range;

+    NSUInteger length;

 
 

-    range = [[self id] rangeOfString:text options:MatchCompareOptions_];
-    if (range.location != NSNotFound)
-        return YES;
+    string = [self name];
+    length = [string length];

 
 

-    range = [[self name] rangeOfString:text options:MatchCompareOptions_];
-    if (range.location != NSNotFound)
-        return YES;
+    for (NSString *term in query) {
+        range = [string rangeOfString:term options:MatchCompareOptions_];
+        if (range.location != NSNotFound)
+            rank_ -= 6 * 1000000 / length;
+    }

 
 

-    [self parse];
+    if (rank_ == 0) {
+        string = [self id];
+        length = [string length];

 
 

-    NSString *description([self shortDescription]);
-    NSUInteger length([description length]);
+        for (NSString *term in query) {
+            range = [string rangeOfString:term options:MatchCompareOptions_];
+            if (range.location != NSNotFound)
+                rank_ -= 6 * 1000000 / length;
+        }
+    }

 
 

-    range = [[self shortDescription] rangeOfString:text options:MatchCompareOptions_ range:NSMakeRange(0, std::min<NSUInteger>(length, 100))];
-    if (range.location != NSNotFound)
-        return YES;
+    string = [self shortDescription];
+    length = [string length];
+    NSUInteger stop(std::min<NSUInteger>(length, 200));

 
 

-    return NO;
+    for (NSString *term in query) {
+        range = [string rangeOfString:term options:MatchCompareOptions_ range:NSMakeRange(0, stop)];
+        if (range.location != NSNotFound)
+            rank_ -= 2 * 100000;
+    }
+
+    return rank_ != 0;

 }
 
 - (bool) hasSupportingRole {
 }
 
 - (bool) hasSupportingRole {


@@ -2906,7 +2913,7 @@ struct PackageNameOrdering :
 }
 
 - (NSString *) primaryPurpose {
 }
 
 - (NSString *) primaryPurpose {

-    for (NSString *tag in tags_)
+    for (NSString *tag in (NSArray *) tags_)

         if ([tag hasPrefix:@"purpose::"])
             return [tag substringFromIndex:9];
     return nil;
         if ([tag hasPrefix:@"purpose::"])
             return [tag substringFromIndex:9];
     return nil;


@@ -2914,7 +2921,7 @@ struct PackageNameOrdering :
 
 - (NSArray *) purposes {
     NSMutableArray *purposes([NSMutableArray arrayWithCapacity:2]);
 
 - (NSArray *) purposes {
     NSMutableArray *purposes([NSMutableArray arrayWithCapacity:2]);

-    for (NSString *tag in tags_)
+    for (NSString *tag in (NSArray *) tags_)

         if ([tag hasPrefix:@"purpose::"])
             [purposes addObject:[tag substringFromIndex:9]];
     return [purposes count] == 0 ? nil : purposes;
         if ([tag hasPrefix:@"purpose::"])
             [purposes addObject:[tag substringFromIndex:9]];
     return [purposes count] == 0 ? nil : purposes;


@@ -2980,7 +2987,7 @@ struct PackageNameOrdering :
     cache->MarkDelete(iterator_, true);
 } }
 
     cache->MarkDelete(iterator_, true);
 } }
 

-- (bool) isUnfilteredAndSearchedForBy:(NSString *)search {
+- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query {

     _profile(Package$isUnfilteredAndSearchedForBy)
         bool value(true);
 
     _profile(Package$isUnfilteredAndSearchedForBy)
         bool value(true);
 


@@ -2989,7 +2996,7 @@ struct PackageNameOrdering :
         _end
 
         _profile(Package$isUnfilteredAndSearchedForBy$Match)
         _end
 
         _profile(Package$isUnfilteredAndSearchedForBy$Match)

-            value &= [self matches:search];
+            value &= [self matches:query];

         _end
 
         return value;
         _end
 
         return value;


@@ -3037,11 +3044,11 @@ struct PackageNameOrdering :
 /* }}} */
 /* Section Class {{{ */
 @interface Section : NSObject {
 /* }}} */
 /* Section Class {{{ */
 @interface Section : NSObject {

-    NSString *name_;
+    _H<NSString> name_;

     unichar index_;
     size_t row_;
     size_t count_;
     unichar index_;
     size_t row_;
     size_t count_;

-    NSString *localized_;
+    _H<NSString> localized_;

 }
 
 - (NSComparisonResult) compareByLocalized:(Section *)section;
 }
 
 - (NSComparisonResult) compareByLocalized:(Section *)section;


@@ -3065,13 +3072,6 @@ struct PackageNameOrdering :
 
 @implementation Section
 
 
 @implementation Section
 

-- (void) dealloc {
-    [name_ release];
-    if (localized_ != nil)
-        [localized_ release];
-    [super dealloc];
-}
-

 - (NSComparisonResult) compareByLocalized:(Section *)section {
     NSString *lhs(localized_);
     NSString *rhs([section localized]);
 - (NSComparisonResult) compareByLocalized:(Section *)section {
     NSString *lhs(localized_);
     NSString *rhs([section localized]);


@@ -3092,7 +3092,7 @@ struct PackageNameOrdering :
 - (Section *) initWithName:(NSString *)name localized:(NSString *)localized {
     if ((self = [self initWithName:name localize:NO]) != nil) {
         if (localized != nil)
 - (Section *) initWithName:(NSString *)name localized:(NSString *)localized {
     if ((self = [self initWithName:name localize:NO]) != nil) {
         if (localized != nil)

-            localized_ = [localized retain];
+            localized_ = localized;

     } return self;
 }
 
     } return self;
 }
 


@@ -3102,18 +3102,18 @@ struct PackageNameOrdering :
 
 - (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize {
     if ((self = [super init]) != nil) {
 
 - (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize {
     if ((self = [super init]) != nil) {

-        name_ = [name retain];
+        name_ = name;

         index_ = '\0';
         row_ = row;
         if (localize)
         index_ = '\0';
         row_ = row;
         if (localize)

-            localized_ = [LocalizeSection(name_) retain];
+            localized_ = LocalizeSection(name_);

     } return self;
 }
 
 /* XXX: localize the index thingees */
 - (Section *) initWithIndex:(unichar)index row:(size_t)row {
     if ((self = [super init]) != nil) {
     } return self;
 }
 
 /* XXX: localize the index thingees */
 - (Section *) initWithIndex:(unichar)index row:(size_t)row {
     if ((self = [super init]) != nil) {

-        name_ = [[NSString stringWithCharacters:&index length:1] retain];
+        name_ = [NSString stringWithCharacters:&index length:1];

         index_ = index;
         row_ = row;
     } return self;
         index_ = index;
         row_ = row;
     } return self;


@@ -3154,18 +3154,22 @@ struct PackageNameOrdering :
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-static NSString *Colon_;
-static NSString *Elision_;
-static NSString *Error_;
-static NSString *Warning_;
+class CydiaLogCleaner :
+    public pkgArchiveCleaner
+{
+  protected:
+    virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
+        unlink(File);
+    }
+};

 
 /* Database Implementation {{{ */
 @implementation Database
 
 + (Database *) sharedInstance {
 
 /* Database Implementation {{{ */
 @implementation Database
 
 + (Database *) sharedInstance {

-    static Database *instance;
+    static _H<Database> instance;

     if (instance == nil)
     if (instance == nil)

-        instance = [[Database alloc] init];
+        instance = [[[Database alloc] init] autorelease];

     return instance;
 }
 
     return instance;
 }
 


@@ -3181,14 +3185,13 @@ static NSString *Warning_;
 - (void) dealloc {
     // XXX: actually implement this thing
     _assert(false);
 - (void) dealloc {
     // XXX: actually implement this thing
     _assert(false);

-    [sourceList_ release];

     [self releasePackages];
     apr_pool_destroy(pool_);
     NSRecycleZone(zone_);
     [super dealloc];
 }
 
     [self releasePackages];
     apr_pool_destroy(pool_);
     NSRecycleZone(zone_);
     [super dealloc];
 }
 

-- (void) _readCydia:(NSNumber *)fd { _pooled
+- (void) _readCydia:(NSNumber *)fd {

     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;


@@ -3196,6 +3199,8 @@ static NSString *Warning_;
     static Pcre finish_r("^finish:([^:]*)$");
 
     while (std::getline(is, line)) {
     static Pcre finish_r("^finish:([^:]*)$");
 
     while (std::getline(is, line)) {

+        NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+

         const char *data(line.c_str());
         size_t size = line.size();
         lprintf("C:%s\n", data);
         const char *data(line.c_str());
         size_t size = line.size();
         lprintf("C:%s\n", data);


@@ -3206,12 +3211,14 @@ static NSString *Warning_;
             if (index != INT_MAX && index > Finish_)
                 Finish_ = index;
         }
             if (index != INT_MAX && index > Finish_)
                 Finish_ = index;
         }

+
+        [pool release];

     }
 
     _assume(false);
 }
 
     }
 
     _assume(false);
 }
 

-- (void) _readStatus:(NSNumber *)fd { _pooled
+- (void) _readStatus:(NSNumber *)fd {

     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;


@@ -3220,6 +3227,8 @@ static NSString *Warning_;
     static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
 
     while (std::getline(is, line)) {
     static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
 
     while (std::getline(is, line)) {

+        NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+

         const char *data(line.c_str());
         size_t size(line.size());
         lprintf("S:%s\n", data);
         const char *data(line.c_str());
         size_t size(line.size());
         lprintf("S:%s\n", data);


@@ -3259,21 +3268,27 @@ static NSString *Warning_;
                 lprintf("E:unknown pmstatus\n");
         } else
             lprintf("E:unknown status\n");
                 lprintf("E:unknown pmstatus\n");
         } else
             lprintf("E:unknown status\n");

+
+        [pool release];

     }
 
     _assume(false);
 }
 
     }
 
     _assume(false);
 }
 

-- (void) _readOutput:(NSNumber *)fd { _pooled
+- (void) _readOutput:(NSNumber *)fd {

     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 
     while (std::getline(is, line)) {
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 
     while (std::getline(is, line)) {

+        NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+

         lprintf("O:%s\n", line.c_str());
 
         CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:line.c_str()] ofType:kCydiaProgressEventTypeInformation]);
         [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
         lprintf("O:%s\n", line.c_str());
 
         CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:line.c_str()] ofType:kCydiaProgressEventTypeInformation]);
         [progress_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];

+
+        [pool release];

     }
 
     _assume(false);
     }
 
     _assume(false);


@@ -3284,6 +3299,8 @@ static NSString *Warning_;
 }
 
 - (Package *) packageWithName:(NSString *)name {
 }
 
 - (Package *) packageWithName:(NSString *)name {

+    if (name == nil)
+        return nil;

 @synchronized (self) {
     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;
 @synchronized (self) {
     if (static_cast<pkgDepCache *>(cache_) == NULL)
         return nil;


@@ -3309,7 +3326,7 @@ static NSString *Warning_;
             capacity += 1024;
 
         packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL);
             capacity += 1024;
 
         packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL);

-        sourceList_ = [[NSMutableArray alloc] initWithCapacity:16];
+        sourceList_ = [NSMutableArray arrayWithCapacity:16];

 
         int fds[2];
 
 
         int fds[2];
 


@@ -3419,7 +3436,7 @@ static NSString *Warning_;
     return [self popErrorWithTitle:title] || !success;
 }
 
     return [self popErrorWithTitle:title] || !success;
 }
 

-- (void) reloadDataWithInvocation:(NSInvocation *)invocation { CYPoolStart() {
+- (void) reloadDataWithInvocation:(NSInvocation *)invocation {

 @synchronized (self) {
     ++era_;
 
 @synchronized (self) {
     ++era_;
 


@@ -3538,7 +3555,6 @@ static NSString *Warning_;
     {
         /*std::vector<Package *> packages;
         packages.reserve(std::max(10000U, [packages_ count] + 1000));
     {
         /*std::vector<Package *> packages;
         packages.reserve(std::max(10000U, [packages_ count] + 1000));

-        [packages_ release];

         packages_ = nil;*/
 
         _trace();
         packages_ = nil;*/
 
         _trace();


@@ -3546,7 +3562,7 @@ static NSString *Warning_;
         for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
             if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self])
                 //packages.push_back(package);
         for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
             if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self])
                 //packages.push_back(package);

-                CFArrayAppendValue(packages_, [package retain]);
+                CFArrayAppendValue(packages_, CFRetain(package));

 
         _trace();
 
 
         _trace();
 


@@ -3556,9 +3572,9 @@ static NSString *Warning_;
             packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()];
         _trace();*/
 
             packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()];
         _trace();*/
 

-        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(16)];
-        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(4)];
-        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(0)];
+        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(16)];
+        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(4)];
+        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(0)];

 
         /*_trace();
         PrintTimes();
 
         /*_trace();
         PrintTimes();


@@ -3586,7 +3602,7 @@ static NSString *Warning_;
 
         _trace();
     }
 
         _trace();
     }

-} } CYPoolEnd() _trace(); }
+} }

 
 - (void) clear {
 @synchronized (self) {
 
 - (void) clear {
 @synchronized (self) {


@@ -3623,15 +3639,7 @@ static NSString *Warning_;
     pkgAcquire fetcher;
     fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
 
     pkgAcquire fetcher;
     fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
 

-    class LogCleaner :
-        public pkgArchiveCleaner
-    {
-      protected:
-        virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
-            unlink(File);
-        }
-    } cleaner;
-
+    CydiaLogCleaner cleaner;

     if ([self popErrorWithTitle:title forOperation:cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)])
         return false;
 
     if ([self popErrorWithTitle:title forOperation:cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)])
         return false;
 


@@ -3762,13 +3770,13 @@ static NSString *Warning_;
     bool success(ListUpdate(status, list, PulseInterval_));
     if (status.WasCancelled())
         _error->Discard();
     bool success(ListUpdate(status, list, PulseInterval_));
     if (status.WasCancelled())
         _error->Discard();

-    else
+    else {

         [self popErrorWithTitle:title forOperation:success];
         [self popErrorWithTitle:title forOperation:success];

+        [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
+        Changed_ = true;
+    }

 
     [delegate_ performSelectorOnMainThread:@selector(releaseNetworkActivityIndicator) withObject:nil waitUntilDone:YES];
 
     [delegate_ performSelectorOnMainThread:@selector(releaseNetworkActivityIndicator) withObject:nil waitUntilDone:YES];

-
-    [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
-    Changed_ = true;

 }
 
 - (void) setDelegate:(NSObject<DatabaseDelegate> *)delegate {
 }
 
 - (void) setDelegate:(NSObject<DatabaseDelegate> *)delegate {


@@ -3823,7 +3831,7 @@ static NSString *Warning_;
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-static NSMutableSet *Diversions_;
+static _H<NSMutableSet> Diversions_;

 
 @interface Diversion : NSObject {
     Pcre pattern_;
 
 @interface Diversion : NSObject {
     Pcre pattern_;


@@ -3851,7 +3859,7 @@ static NSMutableSet *Diversions_;
   divert:
     NSString *href([url absoluteString]);
 
   divert:
     NSString *href([url absoluteString]);
 

-    for (Diversion *diversion in Diversions_)
+    for (Diversion *diversion in (id) Diversions_)

         if (NSString *diverted = [diversion divert:href]) {
 #if !ForRelease
             NSLog(@"div: %@", diverted);
         if (NSString *diverted = [diversion divert:href]) {
 #if !ForRelease
             NSLog(@"div: %@", diverted);


@@ -3878,7 +3886,7 @@ static NSMutableSet *Diversions_;
 @end
 
 @interface CydiaObject : NSObject {
 @end
 
 @interface CydiaObject : NSObject {

-    id indirect_;
+    _H<IndirectDelegate> indirect_;

     _transient id delegate_;
 }
 
     _transient id delegate_;
 }
 


@@ -3887,7 +3895,7 @@ static NSMutableSet *Diversions_;
 @end
 
 @interface CydiaWebViewController : CyteWebViewController {
 @end
 
 @interface CydiaWebViewController : CyteWebViewController {

-    CydiaObject *cydia_;
+    _H<CydiaObject> cydia_;

 }
 
 + (void) addDiversion:(Diversion *)diversion;
 }
 
 + (void) addDiversion:(Diversion *)diversion;


@@ -3897,14 +3905,9 @@ static NSMutableSet *Diversions_;
 /* Web Scripting {{{ */
 @implementation CydiaObject
 
 /* Web Scripting {{{ */
 @implementation CydiaObject
 

-- (void) dealloc {
-    [indirect_ release];
-    [super dealloc];
-}
-

 - (id) initWithDelegate:(IndirectDelegate *)indirect {
     if ((self = [super init]) != nil) {
 - (id) initWithDelegate:(IndirectDelegate *)indirect {
     if ((self = [super init]) != nil) {

-        indirect_ = [indirect retain];
+        indirect_ = indirect;

     } return self;
 }
 
     } return self;
 }
 


@@ -3915,6 +3918,7 @@ static NSMutableSet *Diversions_;
 + (NSArray *) _attributeKeys {
     return [NSArray arrayWithObjects:
         @"bbsnum",
 + (NSArray *) _attributeKeys {
     return [NSArray arrayWithObjects:
         @"bbsnum",

+        @"cydiaSource",

         @"device",
         @"ecid",
         @"firmware",
         @"device",
         @"ecid",
         @"firmware",


@@ -3989,10 +3993,16 @@ static NSMutableSet *Diversions_;
     if (false);
     else if (selector == @selector(addBridgedHost:))
         return @"addBridgedHost";
     if (false);
     else if (selector == @selector(addBridgedHost:))
         return @"addBridgedHost";

+    else if (selector == @selector(addInsecureHost:))
+        return @"addInsecureHost";

     else if (selector == @selector(addInternalRedirect::))
         return @"addInternalRedirect";
     else if (selector == @selector(addPipelinedHost:scheme:))
         return @"addPipelinedHost";
     else if (selector == @selector(addInternalRedirect::))
         return @"addInternalRedirect";
     else if (selector == @selector(addPipelinedHost:scheme:))
         return @"addPipelinedHost";

+    else if (selector == @selector(addSource:::))
+        return @"addSource";
+    else if (selector == @selector(addTokenHost:))
+        return @"addTokenHost";

     else if (selector == @selector(addTrivialSource:))
         return @"addTrivialSource";
     else if (selector == @selector(close))
     else if (selector == @selector(addTrivialSource:))
         return @"addTrivialSource";
     else if (selector == @selector(close))


@@ -4009,12 +4019,18 @@ static NSMutableSet *Diversions_;
         return @"getKernelString";
     else if (selector == @selector(getInstalledPackages))
         return @"getInstalledPackages";
         return @"getKernelString";
     else if (selector == @selector(getInstalledPackages))
         return @"getInstalledPackages";

+    else if (selector == @selector(getIORegistryEntry::))
+        return @"getIORegistryEntry";

     else if (selector == @selector(getLocaleIdentifier))
         return @"getLocaleIdentifier";
     else if (selector == @selector(getPreferredLanguages))
         return @"getPreferredLanguages";
     else if (selector == @selector(getPackageById:))
         return @"getPackageById";
     else if (selector == @selector(getLocaleIdentifier))
         return @"getLocaleIdentifier";
     else if (selector == @selector(getPreferredLanguages))
         return @"getPreferredLanguages";
     else if (selector == @selector(getPackageById:))
         return @"getPackageById";

+    else if (selector == @selector(getMetadataKeys))
+        return @"getMetadataKeys";
+    else if (selector == @selector(getMetadataValue:))
+        return @"getMetadataValue";

     else if (selector == @selector(getSessionValue:))
         return @"getSessionValue";
     else if (selector == @selector(installPackages:))
     else if (selector == @selector(getSessionValue:))
         return @"getSessionValue";
     else if (selector == @selector(installPackages:))


@@ -4027,6 +4043,12 @@ static NSMutableSet *Diversions_;
         return @"refreshSources";
     else if (selector == @selector(removeButton))
         return @"removeButton";
         return @"refreshSources";
     else if (selector == @selector(removeButton))
         return @"removeButton";

+    else if (selector == @selector(saveConfig))
+        return @"saveConfig";
+    else if (selector == @selector(setCydiaSource:))
+        return @"setCydiaSource";
+    else if (selector == @selector(setMetadataValue::))
+        return @"setMetadataValue";

     else if (selector == @selector(setSessionValue::))
         return @"setSessionValue";
     else if (selector == @selector(substitutePackageNames:))
     else if (selector == @selector(setSessionValue::))
         return @"setSessionValue";
     else if (selector == @selector(substitutePackageNames:))


@@ -4061,6 +4083,8 @@ static NSMutableSet *Diversions_;
         return @"statfs";
     else if (selector == @selector(supports:))
         return @"supports";
         return @"statfs";
     else if (selector == @selector(supports:))
         return @"supports";

+    else if (selector == @selector(unload))
+        return @"unload";

     else
         return nil;
 }
     else
         return nil;
 }


@@ -4073,6 +4097,10 @@ static NSMutableSet *Diversions_;
     return [feature isEqualToString:@"window.open"];
 }
 
     return [feature isEqualToString:@"window.open"];
 }
 

+- (void) unload {
+    [delegate_ performSelectorOnMainThread:@selector(unloadData) withObject:nil waitUntilDone:NO];
+}
+

 - (void) addInternalRedirect:(NSString *)from :(NSString *)to {
     [CydiaWebViewController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
 }
 - (void) addInternalRedirect:(NSString *)from :(NSString *)to {
     [CydiaWebViewController performSelectorOnMainThread:@selector(addDiversion:) withObject:[[[Diversion alloc] initWithFrom:from to:to] autorelease] waitUntilDone:NO];
 }


@@ -4111,24 +4139,83 @@ static NSMutableSet *Diversions_;
     return [NSString stringWithCString:value];
 }
 
     return [NSString stringWithCString:value];
 }
 

-- (id) getSessionValue:(NSString *)key {
-@synchronized (SessionData_) {
-    return [SessionData_ objectForKey:key];
-} }
+- (NSObject *) getIORegistryEntry:(NSString *)path :(NSString *)entry {
+    NSObject *value(CYIOGetValue([path UTF8String], entry));

 
 

-- (void) setSessionValue:(NSString *)key :(NSString *)value {
-@synchronized (SessionData_) {
-    if (value == (id) [WebUndefined undefined])
-        [SessionData_ removeObjectForKey:key];
-    else
-        [SessionData_ setObject:value forKey:key];
-} }
+    if (value != nil)
+        if ([value isKindOfClass:[NSData class]])
+            value = CYHex((NSData *) value);
+
+    return value;
+}
+
+- (void) _setCydiaSource:(NSString *)source {
+    @synchronized (HostConfig_) {
+        CydiaSource_ = source;
+        [Metadata_ setObject:source forKey:@"CydiaSource"];
+    }
+
+    Changed_ = true;
+}
+
+- (void) setCydiaSource:(NSString *)source {
+    [self performSelectorOnMainThread:@selector(_setCydiaSource:) withObject:source waitUntilDone:NO];
+}
+
+- (NSString *) cydiaSource {
+    @synchronized (HostConfig_) {
+        return (id) CydiaSource_ ?: [NSNull null];
+    }
+}
+
+- (NSArray *) getMetadataKeys {
+@synchronized (Values_) {
+    return [Values_ allKeys];
+} }
+
+- (id) getMetadataValue:(NSString *)key {
+@synchronized (Values_) {
+    return [Values_ objectForKey:key];
+} }
+
+- (void) setMetadataValue:(NSString *)key :(NSString *)value {
+@synchronized (Values_) {
+    if (value == nil || value == (id) [WebUndefined undefined] || value == (id) [NSNull null])
+        [Values_ removeObjectForKey:key];
+    else
+        [Values_ setObject:value forKey:key];
+
+    [delegate_ performSelectorOnMainThread:@selector(updateValues) withObject:nil waitUntilDone:YES];
+} }
+
+- (id) getSessionValue:(NSString *)key {
+@synchronized (SessionData_) {
+    return [SessionData_ objectForKey:key];
+} }
+
+- (void) setSessionValue:(NSString *)key :(NSString *)value {
+@synchronized (SessionData_) {
+    if (value == (id) [WebUndefined undefined])
+        [SessionData_ removeObjectForKey:key];
+    else
+        [SessionData_ setObject:value forKey:key];
+} }

 
 - (void) addBridgedHost:(NSString *)host {
 @synchronized (HostConfig_) {
     [BridgedHosts_ addObject:host];
 } }
 
 
 - (void) addBridgedHost:(NSString *)host {
 @synchronized (HostConfig_) {
     [BridgedHosts_ addObject:host];
 } }
 

+- (void) addInsecureHost:(NSString *)host {
+@synchronized (HostConfig_) {
+    [InsecureHosts_ addObject:host];
+} }
+
+- (void) addTokenHost:(NSString *)host {
+@synchronized (HostConfig_) {
+    [TokenHosts_ addObject:host];
+} }
+

 - (void) addPipelinedHost:(NSString *)host scheme:(NSString *)scheme {
 @synchronized (HostConfig_) {
     if (scheme != (id) [WebUndefined undefined])
 - (void) addPipelinedHost:(NSString *)host scheme:(NSString *)scheme {
 @synchronized (HostConfig_) {
     if (scheme != (id) [WebUndefined undefined])


@@ -4143,6 +4230,20 @@ static NSMutableSet *Diversions_;
     [indirect_ performSelectorOnMainThread:@selector(popViewControllerWithNumber:) withObject:value waitUntilDone:NO];
 }
 
     [indirect_ performSelectorOnMainThread:@selector(popViewControllerWithNumber:) withObject:value waitUntilDone:NO];
 }
 

+- (void) addSource:(NSString *)href :(NSString *)distribution :(WebScriptObject *)sections {
+    NSMutableArray *array([NSMutableArray arrayWithCapacity:[sections count]]);
+
+    for (NSString *section in sections)
+        [array addObject:section];
+
+    [delegate_ performSelectorOnMainThread:@selector(addSource:) withObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:
+        @"deb", @"Type",
+        href, @"URI",
+        distribution, @"Distribution",
+        array, @"Sections",
+    nil] waitUntilDone:NO];
+}
+

 - (void) addTrivialSource:(NSString *)href {
     [delegate_ performSelectorOnMainThread:@selector(addTrivialSource:) withObject:href waitUntilDone:NO];
 }
 - (void) addTrivialSource:(NSString *)href {
     [delegate_ performSelectorOnMainThread:@selector(addTrivialSource:) withObject:href waitUntilDone:NO];
 }


@@ -4151,6 +4252,10 @@ static NSMutableSet *Diversions_;
     [delegate_ performSelectorOnMainThread:@selector(syncData) withObject:nil waitUntilDone:NO];
 }
 
     [delegate_ performSelectorOnMainThread:@selector(syncData) withObject:nil waitUntilDone:NO];
 }
 

+- (void) saveConfig {
+    [delegate_ performSelectorOnMainThread:@selector(_saveConfig) withObject:nil waitUntilDone:NO];
+}
+

 - (NSArray *) getAllSources {
     return [[Database sharedInstance] sources];
 }
 - (NSArray *) getAllSources {
     return [[Database sharedInstance] sources];
 }


@@ -4347,136 +4452,34 @@ static NSMutableSet *Diversions_;
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-/* @ Loading... Indicator {{{ */
-@interface CYLoadingIndicator : UIView {
-    _H<UIActivityIndicatorView> spinner_;
-    _H<UILabel> label_;
-    _H<UIView> container_;
-}
-
-@property (readonly, nonatomic) UILabel *label;
-@property (readonly, nonatomic) UIActivityIndicatorView *activityIndicatorView;
-
-@end
-
-@implementation CYLoadingIndicator
-
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        container_ = [[[UIView alloc] init] autorelease];
-        [container_ setAutoresizingMask:UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin];
-
-        spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] autorelease];
-        [spinner_ startAnimating];
-        [container_ addSubview:spinner_];
-
-        label_ = [[[UILabel alloc] init] autorelease];
-        [label_ setFont:[UIFont boldSystemFontOfSize:15.0f]];
-        [label_ setBackgroundColor:[UIColor clearColor]];
-        [label_ setTextColor:[UIColor blackColor]];
-        [label_ setShadowColor:[UIColor whiteColor]];
-        [label_ setShadowOffset:CGSizeMake(0, 1)];
-        [label_ setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]];
-        [container_ addSubview:label_];
-
-        CGSize viewsize = frame.size;
-        CGSize spinnersize = [spinner_ bounds].size;
-        CGSize textsize = [[label_ text] sizeWithFont:[label_ font]];
-        float bothwidth = spinnersize.width + textsize.width + 5.0f;
-
-        CGRect containrect = {
-            CGPointMake(floorf((viewsize.width / 2) - (bothwidth / 2)), floorf((viewsize.height / 2) - (spinnersize.height / 2))),
-            CGSizeMake(bothwidth, spinnersize.height)
-        };
-        CGRect textrect = {
-            CGPointMake(spinnersize.width + 5.0f, floorf((spinnersize.height / 2) - (textsize.height / 2))),
-            textsize
-        };
-        CGRect spinrect = {
-            CGPointZero,
-            spinnersize
-        };
-
-        [container_ setFrame:containrect];
-        [spinner_ setFrame:spinrect];
-        [label_ setFrame:textrect];
-        [self addSubview:container_];
-    } return self;
-}
-
-- (UILabel *) label {
-    return label_;
-}
-
-- (UIActivityIndicatorView *) activityIndicatorView {
-    return spinner_;
-}
-
-@end
-/* }}} */
-/* Emulated Loading Controller {{{ */
-@interface CYEmulatedLoadingController : CyteViewController {
-    _transient Database *database_;
-    _H<CYLoadingIndicator> indicator_;
-    _H<UITabBar> tabbar_;
-    _H<UINavigationBar> navbar_;
-}
-
+@interface NSURL (CydiaSecure)

 @end
 
 @end
 

-@implementation CYEmulatedLoadingController
-
-- (id) initWithDatabase:(Database *)database {
-    if ((self = [super init]) != nil) {
-        database_ = database;
-    } return self;
-}
-
-- (void) loadView {
-    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
-
-    UITableView *table([[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease]);
-    [table setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
-    [[self view] addSubview:table];
-
-    indicator_ = [[[CYLoadingIndicator alloc] initWithFrame:[[self view] bounds]] autorelease];
-    [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
-    [[self view] addSubview:indicator_];
+@implementation NSURL (CydiaSecure)

 
 

-    tabbar_ = [[[UITabBar alloc] initWithFrame:CGRectMake(0, 0, 0, 49.0f)] autorelease];
-    [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_];
+- (bool) isCydiaSecure {
+    if ([[[self scheme] lowercaseString] isEqualToString:@"https"])
+        return true;

 
 

-    navbar_ = [[[UINavigationBar alloc] initWithFrame:CGRectMake(0, 0, 0, 44.0f)] autorelease];
-    [navbar_ setFrame:CGRectMake(0.0f, 0.0f, [[self view] bounds].size.width, [navbar_ bounds].size.height)];
-    [navbar_ setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleWidth];
-    [[self view] addSubview:navbar_];
-}
+    @synchronized (HostConfig_) {
+        if ([InsecureHosts_ containsObject:[self host]])
+            return true;
+    }

 
 

-- (void) releaseSubviews {
-    indicator_ = nil;
-    tabbar_ = nil;
-    navbar_ = nil;
+    return false;

 }
 
 @end
 }
 
 @end

-/* }}} */

 
 /* Cydia Browser Controller {{{ */
 @implementation CydiaWebViewController
 
 
 /* Cydia Browser Controller {{{ */
 @implementation CydiaWebViewController
 

-- (void) dealloc {
-    [cydia_ release];
-    [super dealloc];
-}
-

 - (NSURL *) navigationURL {
     return request_ == nil ? nil : [NSURL URLWithString:[NSString stringWithFormat:@"cydia://url/%@", [[request_ URL] absoluteString]]];
 }
 
 + (void) initialize {
 - (NSURL *) navigationURL {
     return request_ == nil ? nil : [NSURL URLWithString:[NSString stringWithFormat:@"cydia://url/%@", [[request_ URL] absoluteString]]];
 }
 
 + (void) initialize {

-    Diversions_ = [[NSMutableSet alloc] initWithCapacity:0];
+    Diversions_ = [NSMutableSet setWithCapacity:0];

 }
 
 + (void) addDiversion:(Diversion *)diversion {
 }
 
 + (void) addDiversion:(Diversion *)diversion {


@@ -4505,19 +4508,37 @@ static NSMutableSet *Diversions_;
         [window setValue:cydia_ forKey:@"cydia"];
 }
 
         [window setValue:cydia_ forKey:@"cydia"];
 }
 

+- (void) _setupMail:(MFMailComposeViewController *)controller {
+    [controller addAttachmentData:[NSData dataWithContentsOfFile:@"/tmp/cydia.log"] mimeType:@"text/plain" fileName:@"cydia.log"];
+
+    system("/usr/bin/dpkg -l >/tmp/dpkgl.log");
+    [controller addAttachmentData:[NSData dataWithContentsOfFile:@"/tmp/dpkgl.log"] mimeType:@"text/plain" fileName:@"dpkgl.log"];
+}
+

 - (NSURL *) URLWithURL:(NSURL *)url {
     return [Diversion divertURL:url];
 }
 
 - (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
 - (NSURL *) URLWithURL:(NSURL *)url {
     return [Diversion divertURL:url];
 }
 
 - (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {

+    NSURL *url([request URL]);
+    NSString *host([url host]);
+

     NSMutableURLRequest *copy([[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source] mutableCopy]);
 
     NSMutableURLRequest *copy([[super webView:view resource:resource willSendRequest:request redirectResponse:response fromDataSource:source] mutableCopy]);
 

-    if (System_ != NULL)
+    if (System_ != NULL && [copy valueForHTTPHeaderField:@"X-System"] == nil)

         [copy setValue:System_ forHTTPHeaderField:@"X-System"];
         [copy setValue:System_ forHTTPHeaderField:@"X-System"];

-    if (Machine_ != NULL)
+    if (Machine_ != NULL && [copy valueForHTTPHeaderField:@"X-Machine"] == nil)

         [copy setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
         [copy setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];

-    if (Token_ != nil)
-        [copy setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"];
+
+    bool token;
+    @synchronized (HostConfig_) {
+        token = [TokenHosts_ containsObject:host] || [BridgedHosts_ containsObject:host];
+    }
+
+    if ([url isCydiaSecure] && token) {
+        if (Token_ != nil && [copy valueForHTTPHeaderField:@"X-Cydia-Token"] == nil)
+            [copy setValue:Token_ forHTTPHeaderField:@"X-Cydia-Token"];
+    }

 
     return copy;
 }
 
     return copy;
 }


@@ -4527,23 +4548,35 @@ static NSMutableSet *Diversions_;
     [cydia_ setDelegate:delegate];
 }
 
     [cydia_ setDelegate:delegate];
 }
 

+- (NSString *) applicationNameForUserAgent {
+    NSString *application([NSString stringWithFormat:@"Cydia/%@", @ Cydia_]);
+
+    if (Safari_ != nil)
+        application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];
+    if (Build_ != nil)
+        application = [NSString stringWithFormat:@"Mobile/%@ %@", Build_, application];
+    if (Product_ != nil)
+        application = [NSString stringWithFormat:@"Version/%@ %@", Product_, application];
+
+    return application;
+}
+

 - (id) init {
     if ((self = [super initWithWidth:0 ofClass:[CydiaWebViewController class]]) != nil) {
 - (id) init {
     if ((self = [super initWithWidth:0 ofClass:[CydiaWebViewController class]]) != nil) {

-        cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_];
+        cydia_ = [[[CydiaObject alloc] initWithDelegate:indirect_] autorelease];
+    } return self;
+}
+
+@end

 
 

-        WebView *webview([[webview_ _documentView] webView]);
+@interface AppCacheController : CydiaWebViewController {
+}

 
 

-        NSString *application([NSString stringWithFormat:@"Cydia/%@", @ Cydia_]);
+@end

 
 

-        if (Safari_ != nil)
-            application = [NSString stringWithFormat:@"Safari/%@ %@", Safari_, application];
-        if (Build_ != nil)
-            application = [NSString stringWithFormat:@"Mobile/%@ %@", Build_, application];
-        if (Product_ != nil)
-            application = [NSString stringWithFormat:@"Version/%@ %@", Product_, application];
+@implementation AppCacheController

 
 

-        [webview setApplicationNameForUserAgent:application];
-    } return self;
+- (void) didReceiveMemoryWarning {

 }
 
 @end
 }
 
 @end


@@ -4610,11 +4643,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @interface ConfirmationController : CydiaWebViewController {
     _transient Database *database_;
 
 @interface ConfirmationController : CydiaWebViewController {
     _transient Database *database_;
 

-    UIAlertView *essential_;
+    _H<UIAlertView> essential_;

 
 

-    NSDictionary *changes_;
-    NSMutableArray *issues_;
-    NSDictionary *sizes_;
+    _H<NSDictionary> changes_;
+    _H<NSMutableArray> issues_;
+    _H<NSDictionary> sizes_;

 
     BOOL substrate_;
 }
 
     BOOL substrate_;
 }


@@ -4625,17 +4658,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation ConfirmationController
 
 
 @implementation ConfirmationController
 

-- (void) dealloc {
-    [changes_ release];
-    [issues_ release];
-    [sizes_ release];
-
-    if (essential_ != nil)
-        [essential_ release];
-
-    [super dealloc];
-}
-

 - (void) complete {
     if (substrate_)
         RestartSubstrate_ = true;
 - (void) complete {
     if (substrate_)
         RestartSubstrate_ = true;


@@ -4662,8 +4684,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) _doContinue {
 }
 
 - (void) _doContinue {

-    [self dismissModalViewControllerAnimated:YES];

     [delegate_ cancelAndClear:NO];
     [delegate_ cancelAndClear:NO];

+    [self dismissModalViewControllerAnimated:YES];

 }
 
 - (id) invokeDefaultMethodWithArguments:(NSArray *)args {
 }
 
 - (id) invokeDefaultMethodWithArguments:(NSArray *)args {


@@ -4675,9 +4697,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [super webView:view didClearWindowObject:window forFrame:frame];
 
     [window setValue:[[NSDictionary dictionaryWithObjectsAndKeys:
     [super webView:view didClearWindowObject:window forFrame:frame];
 
     [window setValue:[[NSDictionary dictionaryWithObjectsAndKeys:

-        changes_, @"changes",
-        issues_, @"issues",
-        sizes_, @"sizes",
+        (id) changes_, @"changes",
+        (id) issues_, @"issues",
+        (id) sizes_, @"sizes",

         self, @"queue",
     nil] Cydia$webScriptObjectInContext:window] forKey:@"cydiaConfirm"];
 }
         self, @"queue",
     nil] Cydia$webScriptObjectInContext:window] forKey:@"cydiaConfirm"];
 }


@@ -4698,7 +4720,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         NSArray *packages([database_ packages]);
         pkgDepCache::Policy *policy([database_ policy]);
 
         NSArray *packages([database_ packages]);
         pkgDepCache::Policy *policy([database_ policy]);
 

-        issues_ = [[NSMutableArray arrayWithCapacity:4] retain];
+        issues_ = [NSMutableArray arrayWithCapacity:4];

 
         for (Package *package in packages) {
             pkgCache::PkgIterator iterator([package iterator]);
 
         for (Package *package in packages) {
             pkgCache::PkgIterator iterator([package iterator]);


@@ -4820,7 +4842,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         else if (Advanced_) {
             NSString *parenthetical(UCLocalize("PARENTHETICAL"));
 
         else if (Advanced_) {
             NSString *parenthetical(UCLocalize("PARENTHETICAL"));
 

-            essential_ = [[UIAlertView alloc]
+            essential_ = [[[UIAlertView alloc]

                 initWithTitle:UCLocalize("REMOVING_ESSENTIALS")
                 message:UCLocalize("REMOVING_ESSENTIALS_EX")
                 delegate:self
                 initWithTitle:UCLocalize("REMOVING_ESSENTIALS")
                 message:UCLocalize("REMOVING_ESSENTIALS_EX")
                 delegate:self


@@ -4828,22 +4850,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 otherButtonTitles:
                     [NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")],
                 nil
                 otherButtonTitles:
                     [NSString stringWithFormat:parenthetical, UCLocalize("FORCE_REMOVAL"), UCLocalize("UNSAFE")],
                 nil

-            ];
+            ] autorelease];

 
             [essential_ setContext:@"remove"];
         } else {
 
             [essential_ setContext:@"remove"];
         } else {

-            essential_ = [[UIAlertView alloc]
+            essential_ = [[[UIAlertView alloc]

                 initWithTitle:UCLocalize("UNABLE_TO_COMPLY")
                 message:UCLocalize("UNABLE_TO_COMPLY_EX")
                 delegate:self
                 cancelButtonTitle:UCLocalize("OKAY")
                 otherButtonTitles:nil
                 initWithTitle:UCLocalize("UNABLE_TO_COMPLY")
                 message:UCLocalize("UNABLE_TO_COMPLY_EX")
                 delegate:self
                 cancelButtonTitle:UCLocalize("OKAY")
                 otherButtonTitles:nil

-            ];
+            ] autorelease];

 
             [essential_ setContext:@"unable"];
         }
 
 
             [essential_ setContext:@"unable"];
         }
 

-        changes_ = [[NSDictionary alloc] initWithObjectsAndKeys:
+        changes_ = [NSDictionary dictionaryWithObjectsAndKeys:

             installs, @"installs",
             reinstalls, @"reinstalls",
             upgrades, @"upgrades",
             installs, @"installs",
             reinstalls, @"reinstalls",
             upgrades, @"upgrades",


@@ -4851,7 +4873,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             removes, @"removes",
         nil];
 
             removes, @"removes",
         nil];
 

-        sizes_ = [[NSDictionary alloc] initWithObjectsAndKeys:
+        sizes_ = [NSDictionary dictionaryWithObjectsAndKeys:

             [NSNumber numberWithInteger:[database_ fetcher].FetchNeeded()], @"downloading",
             [NSNumber numberWithInteger:[database_ fetcher].PartialPresent()], @"resuming",
         nil];
             [NSNumber numberWithInteger:[database_ fetcher].FetchNeeded()], @"downloading",
             [NSNumber numberWithInteger:[database_ fetcher].PartialPresent()], @"resuming",
         nil];


@@ -5028,7 +5050,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ProgressDelegate
 > {
     _transient Database *database_;
     ProgressDelegate
 > {
     _transient Database *database_;

-    _H<CydiaProgressData> progress_;
+    _H<CydiaProgressData, 1> progress_;

     unsigned cancel_;
 }
 
     unsigned cancel_;
 }
 


@@ -5045,7 +5067,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) dealloc {
     [database_ setProgressDelegate:nil];
 
 - (void) dealloc {
     [database_ setProgressDelegate:nil];

-    [progress_ setDelegate:nil];

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


@@ -5099,8 +5120,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) close {
     UpdateExternalStatus(0);
 
 - (void) close {
     UpdateExternalStatus(0);
 

+    if (Finish_ > 1)
+        [delegate_ saveState];
+

     switch (Finish_) {
         case 0:
     switch (Finish_) {
         case 0:

+            [delegate_ returnToCydia];

         break;
 
         case 1:
         break;
 
         case 1:


@@ -5293,89 +5318,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-/* Cell Content View {{{ */
-@protocol ContentDelegate
-- (void) drawContentRect:(CGRect)rect;
-@end
-
-@interface ContentView : UIView {
-    _transient id<ContentDelegate> delegate_;
-}
-
-@end
-
-@implementation ContentView
-
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        [self setNeedsDisplayOnBoundsChange:YES];
-    } return self;
-}
-
-- (void) setDelegate:(id<ContentDelegate>)delegate {
-    delegate_ = delegate;
-}
-
-- (void) drawRect:(CGRect)rect {
-    [super drawRect:rect];
-    [delegate_ drawContentRect:rect];
-}
-
-@end
-/* }}} */
-/* Cydia TableView Cell {{{ */
-@interface CYTableViewCell : UITableViewCell {
-    ContentView *content_;
-    bool highlighted_;
-}
-
-@end
-
-@implementation CYTableViewCell
-
-- (void) dealloc {
-    [content_ release];
-    [super dealloc];
-}
-
-- (void) _updateHighlightColorsForView:(id)view highlighted:(BOOL)highlighted {
-    //NSLog(@"_updateHighlightColorsForView:%@ highlighted:%s [content_=%@]", view, highlighted ? "YES" : "NO", content_);
-
-    if (view == content_) {
-        //NSLog(@"_updateHighlightColorsForView:content_ highlighted:%s", highlighted ? "YES" : "NO", content_);
-        highlighted_ = highlighted;
-    }
-
-    [super _updateHighlightColorsForView:view highlighted:highlighted];
-}
-
-- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
-    //NSLog(@"setSelected:%s animated:%s", selected ? "YES" : "NO", animated ? "YES" : "NO");
-    highlighted_ = selected;
-
-    [super setSelected:selected animated:animated];
-    [content_ setNeedsDisplay];
-}
-
-@end
-/* }}} */
-

 /* Package Cell {{{ */
 /* Package Cell {{{ */

-@interface PackageCell : CYTableViewCell <
-    ContentDelegate
+@interface PackageCell : CyteTableViewCell <
+    CyteTableViewCellDelegate

 > {
 > {

-    UIImage *icon_;
-    NSString *name_;
-    NSString *description_;
+    _H<UIImage> icon_;
+    _H<NSString> name_;
+    _H<NSString> description_;

     bool commercial_;
     bool commercial_;

-    NSString *source_;
-    UIImage *badge_;
-    Package *package_;
-    UIImage *placard_;
+    _H<NSString> source_;
+    _H<UIImage> badge_;
+    _H<UIImage> placard_;
+    bool summarized_;

 }
 
 - (PackageCell *) init;
 }
 
 - (PackageCell *) init;

-- (void) setPackage:(Package *)package;
+- (void) setPackage:(Package *)package asSummary:(bool)summary;

 
 - (void) drawContentRect:(CGRect)rect;
 
 
 - (void) drawContentRect:(CGRect)rect;
 


@@ -5383,53 +5341,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation PackageCell
 
 
 @implementation PackageCell
 

-- (void) clearPackage {
-    if (icon_ != nil) {
-        [icon_ release];
-        icon_ = nil;
-    }
-
-    if (name_ != nil) {
-        [name_ release];
-        name_ = nil;
-    }
-
-    if (description_ != nil) {
-        [description_ release];
-        description_ = nil;
-    }
-
-    if (source_ != nil) {
-        [source_ release];
-        source_ = nil;
-    }
-
-    if (badge_ != nil) {
-        [badge_ release];
-        badge_ = nil;
-    }
-
-    if (placard_ != nil) {
-        [placard_ release];
-        placard_ = nil;
-    }
-
-    [package_ release];
-    package_ = nil;
-}
-
-- (void) dealloc {
-    [self clearPackage];
-    [super dealloc];
-}
-

 - (PackageCell *) init {
     CGRect frame(CGRectMake(0, 0, 320, 74));
     if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) {
         UIView *content([self contentView]);
         CGRect bounds([content bounds]);
 
 - (PackageCell *) init {
     CGRect frame(CGRectMake(0, 0, 320, 74));
     if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) {
         UIView *content([self contentView]);
         CGRect bounds([content bounds]);
 

-        content_ = [[ContentView alloc] initWithFrame:bounds];
+        content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease];

         [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [content addSubview:content_];
 
         [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [content addSubview:content_];
 


@@ -5439,101 +5357,148 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSString *) accessibilityLabel {
 }
 
 - (NSString *) accessibilityLabel {

-    return [NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), name_, description_];
+    return [NSString stringWithFormat:UCLocalize("COLON_DELIMITED"), (id) name_, (id) description_];

 }
 
 }
 

-- (void) setPackage:(Package *)package {
-    [self clearPackage];
-    [package parse];
+- (void) setPackage:(Package *)package asSummary:(bool)summary {
+    summarized_ = summary;

 
 

-    Source *source = [package source];
+    icon_ = nil;
+    name_ = nil;
+    description_ = nil;
+    source_ = nil;
+    badge_ = nil;
+    placard_ = nil;

 
 

-    icon_ = [[package icon] retain];
-    name_ = [[package name] retain];
+    if (package == nil)
+        [content_ setBackgroundColor:[UIColor whiteColor]];
+    else {
+        [package parse];

 
 

-    if (IsWildcat_)
-        description_ = [package longDescription];
-    if (description_ == nil)
-        description_ = [package shortDescription];
-    if (description_ != nil)
-        description_ = [description_ retain];
+        Source *source = [package source];

 
 

-    commercial_ = [package isCommercial];
+        icon_ = [package icon];

 
 

-    package_ = [package retain];
+        if (NSString *name = [package name])
+            name_ = [NSString stringWithString:name];

 
 

-    NSString *label = nil;
-    bool trusted = false;
+        NSString *description(nil);

 
 

-    if (source != nil) {
-        label = [source label];
-        trusted = [source trusted];
-    } else if ([[package id] isEqualToString:@"firmware"])
-        label = UCLocalize("APPLE");
-    else
-        label = [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("UNKNOWN"), UCLocalize("LOCAL")];
+        if (description == nil && IsWildcat_)
+            description = [package longDescription];
+        if (description == nil)
+            description = [package shortDescription];

 
 

-    NSString *from(label);
+        if (description != nil)
+            description_ = [NSString stringWithString:description];

 
 

-    NSString *section = [package simpleSection];
-    if (section != nil && ![section isEqualToString:label]) {
-        section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"];
-        from = [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), from, section];
-    }
+        commercial_ = [package isCommercial];

 
 

-    from = [NSString stringWithFormat:UCLocalize("FROM"), from];
-    source_ = [from retain];
+        NSString *label = nil;
+        bool trusted = false;

 
 

-    if (NSString *purpose = [package primaryPurpose])
-        if ((badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]]) != nil)
-            badge_ = [badge_ retain];
+        if (source != nil) {
+            label = [source label];
+            trusted = [source trusted];
+        } else if ([[package id] isEqualToString:@"firmware"])
+            label = UCLocalize("APPLE");
+        else
+            label = [NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("UNKNOWN"), UCLocalize("LOCAL")];

 
 

-    UIColor *color;
-    NSString *placard;
+        NSString *from(label);

 
 

-    if (NSString *mode = [package_ mode]) {
-        if ([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]) {
-            color = RemovingColor_;
-            //placard = @"removing";
-        } else {
-            color = InstallingColor_;
-            //placard = @"installing";
+        NSString *section = [package simpleSection];
+        if (section != nil && ![section isEqualToString:label]) {
+            section = [[NSBundle mainBundle] localizedStringForKey:section value:nil table:@"Sections"];
+            from = [NSString stringWithFormat:UCLocalize("PARENTHETICAL"), from, section];

         }
 
         }
 

-        // XXX: the removing/installing placards are not @2x
-        placard = nil;
-    } else {
-        color = [UIColor whiteColor];
+        source_ = [NSString stringWithFormat:UCLocalize("FROM"), from];

 
 

-        if ([package installed] != nil)
-            placard = @"installed";
-        else
+        if (NSString *purpose = [package primaryPurpose])
+            badge_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Purposes/%@.png", App_, purpose]];
+
+        UIColor *color;
+        NSString *placard;
+
+        if (NSString *mode = [package mode]) {
+            if ([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]) {
+                color = RemovingColor_;
+                //placard = @"removing";
+            } else {
+                color = InstallingColor_;
+                //placard = @"installing";
+            }
+
+            // XXX: the removing/installing placards are not @2x

             placard = nil;
             placard = nil;

-    }
+        } else {
+            color = [UIColor whiteColor];
+
+            if ([package installed] != nil)
+                placard = @"installed";
+            else
+                placard = nil;
+        }

 
 

-    [content_ setBackgroundColor:color];
+        [content_ setBackgroundColor:color];

 
 

-    if (placard != nil)
-        if ((placard_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/%@.png", App_, placard]]) != nil)
-            placard_ = [placard_ retain];
+        if (placard != nil)
+            placard_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/%@.png", App_, placard]];
+    }

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

-- (void) drawContentRect:(CGRect)rect {
+- (void) drawSummaryContentRect:(CGRect)rect {

     bool highlighted(highlighted_);
     float width([self bounds].size.width);
 
     bool highlighted(highlighted_);
     float width([self bounds].size.width);
 

-#if 0
-    CGContextRef context(UIGraphicsGetCurrentContext());
-    [([[self selectedBackgroundView] superview] != nil ? [UIColor clearColor] : [self backgroundColor]) set];
-    CGContextFillRect(context, rect);
-#endif
+    if (icon_ != nil) {
+        CGRect rect;
+        rect.size = [(UIImage *) icon_ size];
+
+        rect.size.width /= 4;
+        rect.size.height /= 4;
+
+        rect.origin.x = 14 - rect.size.width / 4;
+        rect.origin.y = 14 - rect.size.height / 4;
+
+        [icon_ drawInRect:rect];
+    }
+
+    if (badge_ != nil) {
+        CGRect rect;
+        rect.size = [(UIImage *) badge_ size];
+
+        rect.size.width /= 4;
+        rect.size.height /= 4;
+
+        rect.origin.x = 20 - rect.size.width / 4;
+        rect.origin.y = 20 - rect.size.height / 4;
+
+        [badge_ drawInRect:rect];
+    }
+
+    if (highlighted)
+        UISetColor(White_);
+
+    if (!highlighted)
+        UISetColor(commercial_ ? Purple_ : Black_);
+    [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+
+    if (placard_ != nil)
+        [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
+}
+
+- (void) drawNormalContentRect:(CGRect)rect {
+    bool highlighted(highlighted_);
+    float width([self bounds].size.width);

 
     if (icon_ != nil) {
         CGRect rect;
 
     if (icon_ != nil) {
         CGRect rect;

-        rect.size = [icon_ size];
+        rect.size = [(UIImage *) icon_ size];

 
         rect.size.width /= 2;
         rect.size.height /= 2;
 
         rect.size.width /= 2;
         rect.size.height /= 2;


@@ -5546,7 +5511,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if (badge_ != nil) {
         CGRect rect;
 
     if (badge_ != nil) {
         CGRect rect;

-        rect.size = [badge_ size];
+        rect.size = [(UIImage *) badge_ size];

 
         rect.size.width /= 2;
         rect.size.height /= 2;
 
         rect.size.width /= 2;
         rect.size.height /= 2;


@@ -5573,18 +5538,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
 }
 
         [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
 }
 

+- (void) drawContentRect:(CGRect)rect {
+    if (summarized_)
+        [self drawSummaryContentRect:rect];
+    else
+        [self drawNormalContentRect:rect];
+}
+

 @end
 /* }}} */
 /* Section Cell {{{ */
 @end
 /* }}} */
 /* Section Cell {{{ */

-@interface SectionCell : CYTableViewCell <
-    ContentDelegate
+@interface SectionCell : CyteTableViewCell <
+    CyteTableViewCellDelegate

 > {
 > {

-    NSString *basic_;
-    NSString *section_;
-    NSString *name_;
-    NSString *count_;
-    UIImage *icon_;
-    UISwitch *switch_;
+    _H<NSString> basic_;
+    _H<NSString> section_;
+    _H<NSString> name_;
+    _H<NSString> count_;
+    _H<UIImage> icon_;
+    _H<UISwitch> switch_;

     BOOL editing_;
 }
 
     BOOL editing_;
 }
 


@@ -5594,45 +5566,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation SectionCell
 
 
 @implementation SectionCell
 

-- (void) clearSection {
-    if (basic_ != nil) {
-        [basic_ release];
-        basic_ = nil;
-    }
-
-    if (section_ != nil) {
-        [section_ release];
-        section_ = nil;
-    }
-
-    if (name_ != nil) {
-        [name_ release];
-        name_ = nil;
-    }
-
-    if (count_ != nil) {
-        [count_ release];
-        count_ = nil;
-    }
-}
-
-- (void) dealloc {
-    [self clearSection];
-    [icon_ release];
-    [switch_ release];
-    [super dealloc];
-}
-

 - (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
     if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) {
 - (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
     if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) {

-        icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
-        switch_ = [[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+        icon_ = [UIImage applicationImageNamed:@"folder.png"];
+        switch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)] autorelease];

         [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged];
 
         UIView *content([self contentView]);
         CGRect bounds([content bounds]);
 
         [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged];
 
         UIView *content([self contentView]);
         CGRect bounds([content bounds]);
 

-        content_ = [[ContentView alloc] initWithFrame:bounds];
+        content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease];

         [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [content addSubview:content_];
         [content_ setBackgroundColor:[UIColor whiteColor]];
         [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [content addSubview:content_];
         [content_ setBackgroundColor:[UIColor whiteColor]];


@@ -5661,22 +5604,20 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         editing_ = editing;
     }
 
         editing_ = editing;
     }
 

-    [self clearSection];
+    basic_ = nil;
+    section_ = nil;
+    name_ = nil;
+    count_ = nil;

 
     if (section == nil) {
 
     if (section == nil) {

-        name_ = [UCLocalize("ALL_PACKAGES") retain];
+        name_ = UCLocalize("ALL_PACKAGES");

         count_ = nil;
     } else {
         basic_ = [section name];
         count_ = nil;
     } else {
         basic_ = [section name];

-        if (basic_ != nil)
-            basic_ = [basic_ retain];
-

         section_ = [section localized];
         section_ = [section localized];

-        if (section_ != nil)
-            section_ = [section_ retain];

 
 

-        name_  = [(section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : section_) retain];
-        count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
+        name_  = section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : (NSString *) section_;
+        count_ = [NSString stringWithFormat:@"%d", [section count]];

 
         if (editing_)
             [switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO];
 
         if (editing_)
             [switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO];


@@ -5731,10 +5672,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UITableViewDelegate
 > {
     _transient Database *database_;
     UITableViewDelegate
 > {
     _transient Database *database_;

-    Package *package_;
-    NSString *name_;
-    NSMutableArray *files_;
-    UITableView *list_;
+    _H<Package> package_;
+    _H<NSString> name_;
+    _H<NSMutableArray> files_;
+    _H<UITableView, 2> list_;

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


@@ -5744,16 +5685,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation FileTable
 
 
 @implementation FileTable
 

-- (void) dealloc {
-    [self releaseSubviews];
-
-    [package_ release];
-    [name_ release];
-    [files_ release];
-
-    [super dealloc];
-}
-

 - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return files_ == nil ? 0 : [files_ count];
 }
 - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return files_ == nil ? 0 : [files_ count];
 }


@@ -5783,10 +5714,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 

-    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
+    list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds]] autorelease];

     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:24.0f];
     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:24.0f];

-    [list_ setDataSource:self];
+    [(UITableView *) list_ setDataSource:self];

     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }
     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }


@@ -5798,34 +5729,29 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [list_ release];

     list_ = nil;
     list_ = nil;

+
+    package_ = nil;
+    files_ = nil;
+
+    [super releaseSubviews];

 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;
 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;

-
-        files_ = [[NSMutableArray arrayWithCapacity:32] retain];

     } return self;
 }
 
 - (void) setPackage:(Package *)package {
     } return self;
 }
 
 - (void) setPackage:(Package *)package {

-    if (package_ != nil) {
-        [package_ autorelease];
-        package_ = nil;
-    }
-
-    if (name_ != nil) {
-        [name_ release];
-        name_ = nil;
-    }
+    package_ = nil;
+    name_ = nil;

 
 

-    [files_ removeAllObjects];
+    files_ = [NSMutableArray arrayWithCapacity:32];

 
     if (package != nil) {
 
     if (package != nil) {

-        package_ = [package retain];
-        name_ = [[package id] retain];
+        package_ = package;
+        name_ = [package id];

 
         if (NSArray *files = [package files])
             [files_ addObjectsFromArray:files];
 
         if (NSArray *files = [package files])
             [files_ addObjectsFromArray:files];


@@ -5977,7 +5903,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if ((self = [super init]) != nil) {
         database_ = database;
         buttons_ = [NSMutableArray arrayWithCapacity:4];
     if ((self = [super init]) != nil) {
         database_ = database;
         buttons_ = [NSMutableArray arrayWithCapacity:4];

-        name_ = [NSString stringWithString:name];
+        name_ = name == nil ? @"" : [NSString stringWithString:name];

         [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/package/%@", UI_, (id) name_]]];
     } return self;
 }
         [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/package/%@", UI_, (id) name_]]];
     } return self;
 }


@@ -6036,31 +5962,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 > {
     _transient Database *database_;
     unsigned era_;
 > {
     _transient Database *database_;
     unsigned era_;

-    NSMutableArray *packages_;
-    NSMutableArray *sections_;
-    UITableView *list_;
-    NSMutableArray *index_;
-    NSMutableDictionary *indices_;
-    NSString *title_;
+    _H<NSArray> packages_;
+    _H<NSMutableArray> sections_;
+    _H<UITableView, 2> list_;
+    _H<NSMutableArray> index_;
+    _H<NSMutableDictionary> indices_;
+    _H<NSString> title_;
+    unsigned reloading_;

 }
 
 - (id) initWithDatabase:(Database *)database title:(NSString *)title;
 - (void) setDelegate:(id)delegate;
 - (void) resetCursor;
 }
 
 - (id) initWithDatabase:(Database *)database title:(NSString *)title;
 - (void) setDelegate:(id)delegate;
 - (void) resetCursor;

+- (void) clearData;

 
 @end
 
 @implementation PackageListController
 
 
 @end
 
 @implementation PackageListController
 

-- (void) dealloc {
-    [packages_ release];
-    [sections_ release];
-    [list_ release];
-    [index_ release];
-    [indices_ release];
-    [title_ release];
+- (bool) isSummarized {
+    return false;
+}

 
 

-    [super dealloc];
+- (bool) showsSections {
+    return true;

 }
 
 - (void) deselectWithAnimation:(BOOL)animated {
 }
 
 - (void) deselectWithAnimation:(BOOL)animated {


@@ -6088,15 +6013,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self resizeForKeyboardBounds:bounds duration:0];
 }
 
     [self resizeForKeyboardBounds:bounds duration:0];
 }
 

+- (void) getKeyboardCurve:(UIViewAnimationCurve *)curve duration:(NSTimeInterval *)duration forNotification:(NSNotification *)notification {
+    if (&UIKeyboardAnimationCurveUserInfoKey == NULL)
+        *curve = UIViewAnimationCurveEaseInOut;
+    else
+        [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:curve];
+
+    if (&UIKeyboardAnimationDurationUserInfoKey == NULL)
+        *duration = 0.3;
+    else
+        [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:duration];
+}
+

 - (void) keyboardWillShow:(NSNotification *)notification {
     CGRect bounds;
     CGPoint center;
 - (void) keyboardWillShow:(NSNotification *)notification {
     CGRect bounds;
     CGPoint center;

-    NSTimeInterval duration;
-    UIViewAnimationCurve curve;

     [[[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&bounds];
     [[[notification userInfo] objectForKey:UIKeyboardCenterEndUserInfoKey] getValue:&center];
     [[[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&bounds];
     [[[notification userInfo] objectForKey:UIKeyboardCenterEndUserInfoKey] getValue:&center];

-    [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:&curve];
-    [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:&duration];
+
+    NSTimeInterval duration;
+    UIViewAnimationCurve curve;
+    [self getKeyboardCurve:&curve duration:&duration forNotification:notification];

 
     CGRect kbframe = CGRectMake(round(center.x - bounds.size.width / 2.0), round(center.y - bounds.size.height / 2.0), bounds.size.width, bounds.size.height);
     UIViewController *base = self;
 
     CGRect kbframe = CGRectMake(round(center.x - bounds.size.width / 2.0), round(center.y - bounds.size.height / 2.0), bounds.size.width, bounds.size.height);
     UIViewController *base = self;


@@ -6105,14 +6042,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     CGRect viewframe = [[base view] convertRect:[list_ frame] fromView:[list_ superview]];
     CGRect intersection = CGRectIntersection(viewframe, kbframe);
 
     CGRect viewframe = [[base view] convertRect:[list_ frame] fromView:[list_ superview]];
     CGRect intersection = CGRectIntersection(viewframe, kbframe);
 

+    if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)
+        intersection.size.height += CYStatusBarHeight([self interfaceOrientation]);
+

     [self resizeForKeyboardBounds:intersection duration:duration curve:curve];
 }
 
 - (void) keyboardWillHide:(NSNotification *)notification {
     NSTimeInterval duration;
     UIViewAnimationCurve curve;
     [self resizeForKeyboardBounds:intersection duration:duration curve:curve];
 }
 
 - (void) keyboardWillHide:(NSNotification *)notification {
     NSTimeInterval duration;
     UIViewAnimationCurve curve;

-    [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:&curve];
-    [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:&duration];
+    [self getKeyboardCurve:&curve duration:&duration forNotification:notification];

 
     [self resizeForKeyboardBounds:CGRectZero duration:duration curve:curve];
 }
 
     [self resizeForKeyboardBounds:CGRectZero duration:duration curve:curve];
 }


@@ -6182,7 +6121,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];
     PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];

-    [cell setPackage:[self packageAtIndexPath:path]];
+
+    Package *package([database_ packageWithName:[[self packageAtIndexPath:path] id]]);
+    [cell setPackage:package asSummary:[self isSummarized]];

     return cell;
 }
 
     return cell;
 }
 


@@ -6193,8 +6134,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView {
 }
 
 - (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView {

-    // XXX: is 20 the most optimal number here?
-    return [packages_ count] > 20 ? index_ : nil;
+    if (![self showsSections])
+        return nil;
+
+    return index_;

 }
 
 - (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {
 }
 
 - (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {


@@ -6207,76 +6150,107 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return index;
 }
 
     return index;
 }
 

+- (void) updateHeight {
+    [list_ setRowHeight:([self isSummarized] ? 38 : 73)];
+}
+

 - (id) initWithDatabase:(Database *)database title:(NSString *)title {
     if ((self = [super init]) != nil) {
         database_ = database;
         title_ = [title copy];
         [[self navigationItem] setTitle:title_];
 - (id) initWithDatabase:(Database *)database title:(NSString *)title {
     if ((self = [super init]) != nil) {
         database_ = database;
         title_ = [title copy];
         [[self navigationItem] setTitle:title_];

+    } return self;
+}

 
 

-#if TryIndexedCollation
-        if ([[self class] hasIndexedCollation])
-            index_ = [[[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles] retain]
-        else
-#endif
-            index_ = [[NSMutableArray alloc] initWithCapacity:32];
+- (void) loadView {
+    [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];

 
 

-        indices_ = [[NSMutableDictionary alloc] initWithCapacity:32];
+    list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease];
+    [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+    [[self view] addSubview:list_];

 
 

-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
-        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+    // XXX: is 20 the most optimal number here?
+    [list_ setSectionIndexMinimumDisplayRowCount:20];

 
 

-        list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
-        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
-        [list_ setRowHeight:73];
-        [[self view] addSubview:list_];
+    [(UITableView *) list_ setDataSource:self];
+    [list_ setDelegate:self];

 
 

-        [list_ setDataSource:self];
-        [list_ setDelegate:self];
-    } return self;
+    [self updateHeight];
+}
+
+- (void) releaseSubviews {
+    list_ = nil;
+
+    packages_ = nil;
+    sections_ = nil;
+    index_ = nil;
+    indices_ = nil;
+
+    [super releaseSubviews];

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

-- (bool) hasPackage:(Package *)package {
-    return true;
+- (bool) shouldYield {
+    return false;

 }
 
 }
 

-- (bool) shouldYield {
+- (bool) shouldBlock {

     return false;
 }
 
     return false;
 }
 

-- (void) _reloadPackages:(NSArray *)packages {
-    [packages_ removeAllObjects];
-    [sections_ removeAllObjects];
+- (NSMutableArray *) _reloadPackages {
+@synchronized (database_) {
+    era_ = [database_ era];
+    NSArray *packages([database_ packages]);

 
 

-    _profile(PackageTable$reloadData$Filter)
-        for (Package *package in packages)
-            if ([self hasPackage:package])
-                [packages_ addObject:package];
-    _end
-}
+    return [NSMutableArray arrayWithArray:packages];
+} }

 
 - (void) _reloadData {
 
 - (void) _reloadData {

-    era_ = [database_ era];
-    NSArray *packages = [database_ packages];
+    if (reloading_ != 0) {
+        reloading_ = 2;
+        return;
+    }
+
+    NSArray *packages;

 
     if ([self shouldYield]) {
 
     if ([self shouldYield]) {

-        UIProgressHUD *hud([delegate_ addProgressHUD]);
-        [hud setText:UCLocalize("LOADING")];
-        [self yieldToSelector:@selector(_reloadPackages:) withObject:packages];
-        [delegate_ removeProgressHUD:hud];
+        do {
+            UIProgressHUD *hud;
+
+            if (![self shouldBlock])
+                hud = nil;
+            else {
+                hud = [delegate_ addProgressHUD];
+                [hud setText:UCLocalize("LOADING")];
+            }
+
+            reloading_ = 1;
+            packages = [self yieldToSelector:@selector(_reloadPackages)];
+
+            if (hud != nil)
+                [delegate_ removeProgressHUD:hud];
+        } while (reloading_ == 2);
+
+        reloading_ = 0;

     } else {
     } else {

-        [self _reloadPackages:packages];
+        packages = [self _reloadPackages];

     }
 
     }
 

-    [indices_ removeAllObjects];
+    packages_ = packages;
+
+    indices_ = [NSMutableDictionary dictionaryWithCapacity:32];
+    sections_ = [NSMutableArray arrayWithCapacity:16];

 
     Section *section = nil;
 
 #if TryIndexedCollation
     if ([[self class] hasIndexedCollation]) {
 
     Section *section = nil;
 
 #if TryIndexedCollation
     if ([[self class] hasIndexedCollation]) {

+        index_ = [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles];
+

         id collation = [objc_getClass("UILocalizedIndexedCollation") currentCollation];
         NSArray *titles = [collation sectionIndexTitles];
         int secidx = -1;
         id collation = [objc_getClass("UILocalizedIndexedCollation") currentCollation];
         NSArray *titles = [collation sectionIndexTitles];
         int secidx = -1;


@@ -6309,7 +6283,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } else
 #endif
     {
     } else
 #endif
     {

-        [index_ removeAllObjects];
+        index_ = [NSMutableArray arrayWithCapacity:32];
+
+        bool sectioned([self showsSections]);
+        if (!sectioned) {
+            section = [[[Section alloc] initWithName:nil localize:false] autorelease];
+            [sections_ addObject:section];
+        }

 
         _profile(PackageTable$reloadData$Section)
             for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
 
         _profile(PackageTable$reloadData$Section)
             for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {


@@ -6321,7 +6301,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                     index = [package index];
                 _end
 
                     index = [package index];
                 _end
 

-                if (section == nil || [section index] != index) {
+                if (sectioned && (section == nil || [section index] != index)) {

                     _profile(PackageTable$reloadData$Section$Allocate)
                         section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
                     _end
                     _profile(PackageTable$reloadData$Section$Allocate)
                         section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
                     _end


@@ -6339,18 +6319,34 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         _end
     }
 
         _end
     }
 

+    [self updateHeight];
+

     _profile(PackageTable$reloadData$List)
     _profile(PackageTable$reloadData$List)

+        [(UITableView *) list_ setDataSource:self];

         [list_ reloadData];
     _end
 }
 
 - (void) reloadData {
     [super reloadData];
         [list_ reloadData];
     _end
 }
 
 - (void) reloadData {
     [super reloadData];

-    [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0];
+
+    if ([self shouldYield])
+        [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0];
+    else
+        [self _reloadData];

 }
 
 - (void) resetCursor {
 }
 
 - (void) resetCursor {

-    [list_ scrollRectToVisible:CGRectMake(0, 0, 0, 0) animated:NO];
+    [list_ scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:NO];
+}
+
+- (void) clearData {
+    [self updateHeight];
+
+    [list_ setDataSource:nil];
+    [list_ reloadData];
+
+    [self resetCursor];

 }
 
 @end
 }
 
 @end


@@ -6359,7 +6355,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @interface FilteredPackageListController : PackageListController {
     SEL filter_;
     IMP imp_;
 @interface FilteredPackageListController : PackageListController {
     SEL filter_;
     IMP imp_;

-    id object_;
+    _H<NSObject> object_;

 }
 
 - (void) setObject:(id)object;
 }
 
 - (void) setObject:(id)object;


@@ -6374,17 +6370,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation FilteredPackageListController
 
 
 @implementation FilteredPackageListController
 

-- (void) dealloc {
-    if (object_ != nil)
-        [object_ release];
-    [super dealloc];
-}
-

 - (SEL) filter {
     return filter_;
 }
 
 - (void) setFilter:(SEL)filter {
 - (SEL) filter {
     return filter_;
 }
 
 - (void) setFilter:(SEL)filter {

+@synchronized (self) {

     filter_ = filter;
 
     /* XXX: this is an unsafe optimization of doomy hell */
     filter_ = filter;
 
     /* XXX: this is an unsafe optimization of doomy hell */


@@ -6392,27 +6383,44 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     _assert(method != NULL);
     imp_ = method_getImplementation(method);
     _assert(imp_ != NULL);
     _assert(method != NULL);
     imp_ = method_getImplementation(method);
     _assert(imp_ != NULL);

-}
+} }

 
 - (void) setObject:(id)object {
 
 - (void) setObject:(id)object {

-    if (object_ != nil)
-        [object_ release];
-    if (object == nil)
-        object_ = nil;
-    else
-        object_ = [object retain];
-}
+@synchronized (self) {
+    object_ = object;
+} }

 
 - (void) setObject:(id)object forFilter:(SEL)filter {
 
 - (void) setObject:(id)object forFilter:(SEL)filter {

+@synchronized (self) {

     [self setFilter:filter];
     [self setObject:object];
     [self setFilter:filter];
     [self setObject:object];

-}
+} }
+
+- (NSMutableArray *) _reloadPackages {
+@synchronized (database_) {
+    era_ = [database_ era];
+    NSArray *packages([database_ packages]);
+
+    NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]);

 
 

-- (bool) hasPackage:(Package *)package {
-    _profile(FilteredPackageTable$hasPackage)
-        return [package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(imp_))(package, filter_, object_);
+    IMP imp;
+    SEL filter;
+    _H<NSObject> object;
+
+    @synchronized (self) {
+        imp = imp_;
+        filter = filter_;
+        object = object_;
+    }
+
+    _profile(PackageTable$reloadData$Filter)
+        for (Package *package in packages)
+            if ([package valid] && (*reinterpret_cast<bool (*)(id, SEL, id)>(imp))(package, filter, object))
+                [filtered addObject:package];

     _end
     _end

-}
+
+    return filtered;
+} }

 
 - (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
     if ((self = [super initWithDatabase:database title:title]) != nil) {
 
 - (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
     if ((self = [super initWithDatabase:database title:title]) != nil) {


@@ -6443,6 +6451,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return [NSURL URLWithString:@"cydia://home"];
 }
 
     return [NSURL URLWithString:@"cydia://home"];
 }
 

+- (void) didReceiveMemoryWarning {
+}
+

 - (void) aboutButtonClicked {
     UIAlertView *alert([[[UIAlertView alloc] init] autorelease]);
 
 - (void) aboutButtonClicked {
     UIAlertView *alert([[[UIAlertView alloc] init] autorelease]);
 


@@ -6471,11 +6482,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ] autorelease];
 }
 
     ] autorelease];
 }
 

-- (void) unloadData {
-    [super unloadData];
-    [self reloadData];
-}
-

 @end
 /* }}} */
 /* Manage Controller {{{ */
 @end
 /* }}} */
 /* Manage Controller {{{ */


@@ -6537,24 +6543,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 /* Refresh Bar {{{ */
 @interface RefreshBar : UINavigationBar {
 
 /* Refresh Bar {{{ */
 @interface RefreshBar : UINavigationBar {

-    UIProgressIndicator *indicator_;
-    UITextLabel *prompt_;
-    UIProgressBar *progress_;
-    UINavigationButton *cancel_;
+    _H<UIProgressIndicator> indicator_;
+    _H<UITextLabel> prompt_;
+    _H<UIProgressBar> progress_;
+    _H<UINavigationButton> cancel_;

 }
 
 @end
 
 @implementation RefreshBar
 
 }
 
 @end
 
 @implementation RefreshBar
 

-- (void) dealloc {
-    [indicator_ release];
-    [prompt_ release];
-    [progress_ release];
-    [cancel_ release];
-    [super dealloc];
-}
-

 - (void) positionViews {
     CGRect frame = [cancel_ frame];
     frame.size = [cancel_ sizeThatFits:frame.size];
 - (void) positionViews {
     CGRect frame = [cancel_ frame];
     frame.size = [cancel_ sizeThatFits:frame.size];


@@ -6600,23 +6598,23 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             UIProgressIndicatorStyleMediumBrown :
             UIProgressIndicatorStyleMediumWhite;
 
             UIProgressIndicatorStyleMediumBrown :
             UIProgressIndicatorStyleMediumWhite;
 

-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectZero];
-        [indicator_ setStyle:style];
+        indicator_ = [[[UIProgressIndicator alloc] initWithFrame:CGRectZero] autorelease];
+        [(UIProgressIndicator *) indicator_ setStyle:style];

         [indicator_ startAnimation];
         [self addSubview:indicator_];
 
         [indicator_ startAnimation];
         [self addSubview:indicator_];
 

-        prompt_ = [[UITextLabel alloc] initWithFrame:CGRectZero];
+        prompt_ = [[[UITextLabel alloc] initWithFrame:CGRectZero] autorelease];

         [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
         [prompt_ setBackgroundColor:[UIColor clearColor]];
         [prompt_ setFont:[UIFont systemFontOfSize:15]];
         [self addSubview:prompt_];
 
         [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
         [prompt_ setBackgroundColor:[UIColor clearColor]];
         [prompt_ setFont:[UIFont systemFontOfSize:15]];
         [self addSubview:prompt_];
 

-        progress_ = [[UIProgressBar alloc] initWithFrame:CGRectZero];
+        progress_ = [[[UIProgressBar alloc] initWithFrame:CGRectZero] autorelease];

         [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin];
         [progress_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin];

-        [progress_ setStyle:0];
+        [(UIProgressBar *) progress_ setStyle:0];

         [self addSubview:progress_];
 
         [self addSubview:progress_];
 

-        cancel_ = [[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted];
+        cancel_ = [[[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted] autorelease];

         [cancel_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
         [cancel_ addTarget:delegate action:@selector(cancelPressed) forControlEvents:UIControlEventTouchUpInside];
         [cancel_ setBarStyle:barstyle];
         [cancel_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
         [cancel_ addTarget:delegate action:@selector(cancelPressed) forControlEvents:UIControlEventTouchUpInside];
         [cancel_ setBarStyle:barstyle];


@@ -6667,15 +6665,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ProgressDelegate
 > {
     _transient Database *database_;
     ProgressDelegate
 > {
     _transient Database *database_;

-    RefreshBar *refreshbar_;
+    _H<RefreshBar, 1> refreshbar_;

 
     bool dropped_;
     bool updating_;
     // XXX: ok, "updatedelegate_"?...
     _transient NSObject<CydiaDelegate> *updatedelegate_;
 
 
     bool dropped_;
     bool updating_;
     // XXX: ok, "updatedelegate_"?...
     _transient NSObject<CydiaDelegate> *updatedelegate_;
 

-    id root_;
-    UIViewController *remembered_;
+    _H<UIViewController> remembered_;

     _transient UIViewController *transient_;
 }
 
     _transient UIViewController *transient_;
 }
 


@@ -6694,7 +6691,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     NSMutableArray *controllers = [[self viewControllers] mutableCopy];
     if (transient != nil) {
         if (transient_ == nil)
     NSMutableArray *controllers = [[self viewControllers] mutableCopy];
     if (transient != nil) {
         if (transient_ == nil)

-            remembered_ = [[controllers objectAtIndex:0] retain];
+            remembered_ = [controllers objectAtIndex:0];

         transient_ = transient;
         [transient_ setTabBarItem:[remembered_ tabBarItem]];
         [controllers replaceObjectAtIndex:0 withObject:transient_];
         transient_ = transient;
         [transient_ setTabBarItem:[remembered_ tabBarItem]];
         [controllers replaceObjectAtIndex:0 withObject:transient_];


@@ -6705,7 +6702,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [remembered_ setTabBarItem:[transient_ tabBarItem]];
         transient_ = transient;
         [controllers replaceObjectAtIndex:0 withObject:remembered_];
         [remembered_ setTabBarItem:[transient_ tabBarItem]];
         transient_ = transient;
         [controllers replaceObjectAtIndex:0 withObject:remembered_];

-        [remembered_ release];

         remembered_ = nil;
         [self setViewControllers:controllers];
         [self revealTabBarSelection];
         remembered_ = nil;
         [self setViewControllers:controllers];
         [self revealTabBarSelection];


@@ -6735,20 +6731,21 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) unloadData {
 }
 
 - (void) unloadData {

-    UIViewController *selected([self selectedViewController]);
+    [super unloadData];
+

     for (UINavigationController *controller in [self viewControllers])
         [controller unloadData];
 
     for (UINavigationController *controller in [self viewControllers])
         [controller unloadData];
 

-    [selected reloadData];
+    if (UIViewController *selected = [self selectedViewController])
+        [selected reloadData];

 
 

-    if (UIViewController *unselected = [self unselectedViewController])
+    if (UIViewController *unselected = [self unselectedViewController]) {
+        [unselected unloadData];

         [unselected reloadData];
         [unselected reloadData];

-
-    [super unloadData];
+    }

 }
 
 - (void) dealloc {
 }
 
 - (void) dealloc {

-    [refreshbar_ release];

     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
     [super dealloc];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
     [super dealloc];


@@ -6762,7 +6759,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
 
         [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
 

-        refreshbar_ = [[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self];
+        refreshbar_ = [[[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self] autorelease];

     } return self;
 }
 
     } return self;
 }
 


@@ -6771,7 +6768,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) beginUpdate {
 }
 
 - (void) beginUpdate {

-    [refreshbar_ start];
+    [(RefreshBar *) refreshbar_ start];

     [self dropBar:YES];
 
     [updatedelegate_ retainNetworkActivityIndicator];
     [self dropBar:YES];
 
     [updatedelegate_ retainNetworkActivityIndicator];


@@ -6784,7 +6781,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ];
 }
 
     ];
 }
 

-- (void) performUpdate { _pooled
+- (void) performUpdate {
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+

     Status status;
     status.setDelegate(self);
     [database_ updateWithStatus:status];
     Status status;
     status.setDelegate(self);
     [database_ updateWithStatus:status];


@@ -6794,6 +6793,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         withObject:nil
         waitUntilDone:NO
     ];
         withObject:nil
         waitUntilDone:NO
     ];

+
+    [pool release];

 }
 
 - (void) stopUpdateWithSelector:(SEL)selector {
 }
 
 - (void) stopUpdateWithSelector:(SEL)selector {


@@ -6849,14 +6850,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     updatedelegate_ = delegate;
 }
 
     updatedelegate_ = delegate;
 }
 

-- (CGFloat) statusBarHeight {
-    if (UIInterfaceOrientationIsPortrait([self interfaceOrientation])) {
-        return [[UIApplication sharedApplication] statusBarFrame].size.height;
-    } else {
-        return [[UIApplication sharedApplication] statusBarFrame].size.width;
-    }
-}
-

 - (UIView *) transitionView {
     if ([self respondsToSelector:@selector(_transitionView)])
         return [self _transitionView];
 - (UIView *) transitionView {
     if ([self respondsToSelector:@selector(_transitionView)])
         return [self _transitionView];


@@ -6875,7 +6868,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     CGRect barframe([refreshbar_ frame]);
 
     if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)
     CGRect barframe([refreshbar_ frame]);
 
     if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)

-        barframe.origin.y = [self statusBarHeight];
+        barframe.origin.y = CYStatusBarHeight([self interfaceOrientation]);

     else
         barframe.origin.y = 0;
 
     else
         barframe.origin.y = 0;
 


@@ -6895,9 +6888,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     // Ensure bar has the proper width for our view, it might have changed
     barframe.size.width = viewframe.size.width;
     [refreshbar_ setFrame:barframe];
     // Ensure bar has the proper width for our view, it might have changed
     barframe.size.width = viewframe.size.width;
     [refreshbar_ setFrame:barframe];

-
-    // XXX: fix Apple's layout bug
-    [[root_ selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];

 }
 
 - (void) raiseBar:(BOOL)animated {
 }
 
 - (void) raiseBar:(BOOL)animated {


@@ -6920,18 +6910,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if (animated)
         [UIView commitAnimations];
 
     if (animated)
         [UIView commitAnimations];

-
-    // XXX: fix Apple's layout bug
-    // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];

 }
 
 }
 

-#if 0
-- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration {
-    // XXX: fix Apple's layout bug
-    // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];
-}
-#endif
-

 - (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
     bool dropped(dropped_);
 
 - (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
     bool dropped(dropped_);
 


@@ -6942,9 +6922,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if (dropped)
         [self dropBar:NO];
 
     if (dropped)
         [self dropBar:NO];

-
-    // XXX: fix Apple's layout bug
-    // SRK [[self selectedViewController] _updateLayoutForStatusBarAndInterfaceOrientation];

 }
 
 - (void) statusBarFrameChanged:(NSNotification *)notification {
 }
 
 - (void) statusBarFrameChanged:(NSNotification *)notification {


@@ -6975,8 +6952,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) reloadData {
     [super reloadData];
 
 - (void) reloadData {
     [super reloadData];
 

-    if (UIViewController *visible = [self visibleViewController])
+    UIViewController *visible([self visibleViewController]);
+    if (visible != nil)

         [visible reloadData];
         [visible reloadData];

+
+    // on the iPad, this view controller is ALSO visible. :(
+    if (IsWildcat_)
+        if (UIViewController *top = [self topViewController])
+            if (top != visible)
+                [top reloadData];

 }
 
 - (void) unloadData {
 }
 
 - (void) unloadData {


@@ -7065,6 +7049,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         Package *package([database packageWithName:path]);
         if (package == nil)
             goto fail;
         Package *package([database packageWithName:path]);
         if (package == nil)
             goto fail;

+        [package parse];

         UIImage *icon([package icon]);
         [self _returnPNGWithImage:icon forRequest:request];
     } else if ([command isEqualToString:@"source-icon"]) {
         UIImage *icon([package icon]);
         [self _returnPNGWithImage:icon forRequest:request];
     } else if ([command isEqualToString:@"source-icon"]) {


@@ -7086,8 +7071,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         if (path == nil)
             goto fail;
         path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         if (path == nil)
             goto fail;
         path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];

-        NSString *section(Simplify(path));
-        UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]);
+        UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, [path stringByReplacingOccurrencesOfString:@" " withString:@"_"]]]);

         if (icon == nil)
             icon = [UIImage applicationImageNamed:@"unknown.png"];
         [self _returnPNGWithImage:icon forRequest:request];
         if (icon == nil)
             icon = [UIImage applicationImageNamed:@"unknown.png"];
         [self _returnPNGWithImage:icon forRequest:request];


@@ -7143,9 +7127,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UITableViewDelegate
 > {
     _transient Database *database_;
     UITableViewDelegate
 > {
     _transient Database *database_;

-    NSMutableArray *sections_;
-    NSMutableArray *filtered_;
-    UITableView *list_;
+    _H<NSMutableArray> sections_;
+    _H<NSMutableArray> filtered_;
+    _H<UITableView, 2> list_;

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


@@ -7155,14 +7139,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation SectionsController
 
 
 @implementation SectionsController
 

-- (void) dealloc {
-    [self releaseSubviews];
-    [sections_ release];
-    [filtered_ release];
-
-    [super dealloc];
-}
-

 - (NSURL *) navigationURL {
     return [NSURL URLWithString:@"cydia://sections"];
 }
 - (NSURL *) navigationURL {
     return [NSURL URLWithString:@"cydia://sections"];
 }


@@ -7255,10 +7231,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 

-    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
+    list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds]] autorelease];

     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:45.0f];
     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:45.0f];

-    [list_ setDataSource:self];
+    [(UITableView *) list_ setDataSource:self];

     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }
     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }


@@ -7270,16 +7246,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [list_ release];

     list_ = nil;
     list_ = nil;

+
+    sections_ = nil;
+    filtered_ = nil;
+
+    [super releaseSubviews];

 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;
 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;

-
-        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
-        filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];

     } return self;
 }
 
     } return self;
 }
 


@@ -7288,8 +7265,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     NSArray *packages = [database_ packages];
 
 
     NSArray *packages = [database_ packages];
 

-    [sections_ removeAllObjects];
-    [filtered_ removeAllObjects];
+    sections_ = [NSMutableArray arrayWithCapacity:16];
+    filtered_ = [NSMutableArray arrayWithCapacity:16];

 
     NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
 
 
     NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
 


@@ -7325,7 +7302,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [sections_ sortUsingSelector:@selector(compareByLocalized:)];
 
 
     [sections_ sortUsingSelector:@selector(compareByLocalized:)];
 

-    for (Section *section in sections_) {
+    for (Section *section in (id) sections_) {

         size_t count([section row]);
         if (count == 0)
             continue;
         size_t count([section row]);
         if (count == 0)
             continue;


@@ -7354,9 +7331,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 > {
     _transient Database *database_;
     unsigned era_;
 > {
     _transient Database *database_;
     unsigned era_;

-    CFMutableArrayRef packages_;
-    NSMutableArray *sections_;
-    UITableView *list_;
+    _H<NSArray> packages_;
+    _H<NSMutableArray> sections_;
+    _H<UITableView, 2> list_;

     unsigned upgrades_;
 }
 
     unsigned upgrades_;
 }
 


@@ -7366,14 +7343,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation ChangesController
 
 
 @implementation ChangesController
 

-- (void) dealloc {
-    [self releaseSubviews];
-    CFRelease(packages_);
-    [sections_ release];
-
-    [super dealloc];
-}
-

 - (NSURL *) navigationURL {
     return [NSURL URLWithString:@"cydia://changes"];
 }
 - (NSURL *) navigationURL {
     return [NSURL URLWithString:@"cydia://changes"];
 }


@@ -7400,10 +7369,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return [[sections_ objectAtIndex:section] count];
 }
 
     return [[sections_ objectAtIndex:section] count];
 }
 

-- (Package *) packageAtIndex:(NSUInteger)index {
-    return (Package *) CFArrayGetValueAtIndex(packages_, index);
-}
-

 - (Package *) packageAtIndexPath:(NSIndexPath *)path {
 @synchronized (database_) {
     if ([database_ era] != era_)
 - (Package *) packageAtIndexPath:(NSIndexPath *)path {
 @synchronized (database_) {
     if ([database_ era] != era_)


@@ -7414,14 +7379,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         return nil;
     Section *section([sections_ objectAtIndex:sectionIndex]);
     NSInteger row([path row]);
         return nil;
     Section *section([sections_ objectAtIndex:sectionIndex]);
     NSInteger row([path row]);

-    return [[[self packageAtIndex:([section row] + row)] retain] autorelease];
+    return [[[packages_ objectAtIndex:([section row] + row)] retain] autorelease];

 } }
 
 - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
     PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];
 } }
 
 - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
     PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
     if (cell == nil)
         cell = [[[PackageCell alloc] init] autorelease];

-    [cell setPackage:[self packageAtIndexPath:path]];
+
+    Package *package([database_ packageWithName:[[self packageAtIndexPath:path] id]]);
+    [cell setPackage:package asSummary:false];

     return cell;
 }
 
     return cell;
 }
 


@@ -7440,15 +7407,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) upgradeButtonClicked {
     [delegate_ distUpgrade];
 
 - (void) upgradeButtonClicked {
     [delegate_ distUpgrade];

+    [[self navigationItem] setRightBarButtonItem:nil animated:YES];

 }
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 
 }
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 

-    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
+    list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease];

     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:73];
     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:73];

-    [list_ setDataSource:self];
+    [(UITableView *) list_ setDataSource:self];

     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }
     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }


@@ -7460,54 +7428,62 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [list_ release];

     list_ = nil;
     list_ = nil;

+
+    packages_ = nil;
+    sections_ = nil;
+
+    [super releaseSubviews];

 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;
 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;

-
-        packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
-        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];

     } return self;
 }
 
     } return self;
 }
 

-// this mostly works because reloadData (below) is @synchronized (database_)
-// XXX: that said, I've been running into problems with NSRangeExceptions :(
-- (void) _reloadPackages:(NSArray *)packages {
-    CFRelease(packages_);
-    packages_ = CFArrayCreateMutable(kCFAllocatorDefault, [packages count], NULL);
+- (NSMutableArray *) _reloadPackages {
+@synchronized (database_) {
+    era_ = [database_ era];
+    NSArray *packages([database_ packages]);
+
+    NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]);

 
     _trace();
     _profile(ChangesController$_reloadPackages$Filter)
         for (Package *package in packages)
             if ([package upgradableAndEssential:YES] || [package visible])
 
     _trace();
     _profile(ChangesController$_reloadPackages$Filter)
         for (Package *package in packages)
             if ([package upgradableAndEssential:YES] || [package visible])

-                CFArrayAppendValue(packages_, package);
+                CFArrayAppendValue((CFMutableArrayRef) filtered, package);

     _end
     _trace();
     _profile(ChangesController$_reloadPackages$radixSort)
     _end
     _trace();
     _profile(ChangesController$_reloadPackages$radixSort)

-        [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackageChangesRadix) withContext:NULL];
+        [filtered radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackageChangesRadix) withContext:NULL];

     _end
     _trace();
     _end
     _trace();

-}
+
+    return filtered;
+} }

 
 - (void) _reloadData {
 
 - (void) _reloadData {

-@synchronized (database_) {
-    era_ = [database_ era];
-    NSArray *packages = [database_ packages];
+    NSArray *packages;
+
+  reload:
+    if (true) {
+        UIProgressHUD *hud([delegate_ addProgressHUD]);
+        [hud setText:UCLocalize("LOADING")];
+        //NSLog(@"HUD:%@::%@", delegate_, hud);
+        packages = [self yieldToSelector:@selector(_reloadPackages)];
+        [delegate_ removeProgressHUD:hud];
+    } else {
+        packages = [self _reloadPackages];
+    }

 
 

-    [sections_ removeAllObjects];
+@synchronized (database_) {
+    if (era_ != [database_ era])
+        goto reload;

 
 

-#if 1
-    UIProgressHUD *hud([delegate_ addProgressHUD]);
-    [hud setText:UCLocalize("LOADING")];
-    //NSLog(@"HUD:%@::%@", delegate_, hud);
-    [self yieldToSelector:@selector(_reloadPackages:) withObject:packages];
-    [delegate_ removeProgressHUD:hud];
-#else
-    [self _reloadPackages:packages];
-#endif
+    packages_ = packages;
+    sections_ = [NSMutableArray arrayWithCapacity:16];

 
     Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
     Section *ignored = nil;
 
     Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
     Section *ignored = nil;


@@ -7519,8 +7495,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle));
 
 
     CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle));
 

-    for (size_t offset = 0, count = CFArrayGetCount(packages_); offset != count; ++offset) {
-        Package *package = [self packageAtIndex:offset];
+    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];

 
         BOOL uae = [package upgradableAndEssential:YES];
 
 
         BOOL uae = [package upgradableAndEssential:YES];
 


@@ -7560,7 +7536,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (unseens) {
         Section *last = [sections_ lastObject];
         size_t count = [last count];
     if (unseens) {
         Section *last = [sections_ lastObject];
         size_t count = [last count];

-        CFArrayReplaceValues(packages_, CFRangeMake(CFArrayGetCount(packages_) - count, count), NULL, 0);
+        [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)];

         [sections_ removeLastObject];
     }
 
         [sections_ removeLastObject];
     }
 


@@ -7571,21 +7547,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [list_ reloadData];
 
 
     [list_ reloadData];
 

-    if (upgrades_ > 0)
-        [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
-            initWithTitle:[NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]]
-            style:UIBarButtonItemStylePlain
-            target:self
-            action:@selector(upgradeButtonClicked)
-        ] autorelease]];
+    [[self navigationItem] setRightBarButtonItem:(upgrades_ == 0 ? nil : [[[UIBarButtonItem alloc]
+        initWithTitle:[NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]]
+        style:UIBarButtonItemStylePlain
+        target:self
+        action:@selector(upgradeButtonClicked)
+    ] autorelease]) animated:YES];

 
 

-    if (![delegate_ updating])
-        [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
-            initWithTitle:UCLocalize("REFRESH")
-            style:UIBarButtonItemStylePlain
-            target:self
-            action:@selector(refreshButtonClicked)
-        ] autorelease]];
+    [[self navigationItem] setLeftBarButtonItem:([delegate_ updating] ? nil : [[[UIBarButtonItem alloc]
+        initWithTitle:UCLocalize("REFRESH")
+        style:UIBarButtonItemStylePlain
+        target:self
+        action:@selector(refreshButtonClicked)
+    ] autorelease]) animated:YES];

 
     PrintTimes();
 } }
 
     PrintTimes();
 } }


@@ -7601,7 +7575,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @interface SearchController : FilteredPackageListController <
     UISearchBarDelegate
 > {
 @interface SearchController : FilteredPackageListController <
     UISearchBarDelegate
 > {

-    _H<UISearchBar> search_;
+    _H<UISearchBar, 1> search_;

     BOOL searchloaded_;
 }
 
     BOOL searchloaded_;
 }
 


@@ -7612,11 +7586,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation SearchController
 
 
 @implementation SearchController
 

-- (void) dealloc {
-    [search_ setDelegate:nil];
-    [super dealloc];
-}
-

 - (NSURL *) navigationURL {
     if ([search_ text] == nil || [[search_ text] isEqualToString:@""])
         return [NSURL URLWithString:@"cydia://search"];
 - (NSURL *) navigationURL {
     if ([search_ text] == nil || [[search_ text] isEqualToString:@""])
         return [NSURL URLWithString:@"cydia://search"];


@@ -7624,14 +7593,28 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://search/%@", [search_ text]]];
 }
 
         return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://search/%@", [search_ text]]];
 }
 

+- (void) useSearch {
+    [self setObject:[[search_ text] componentsSeparatedByString:@" "] forFilter:@selector(isUnfilteredAndSearchedForBy:)];
+    [self clearData];
+    [self reloadData];
+}
+
+- (void) viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+
+    if ([self filter] == @selector(isUnfilteredAndSelectedForBy:))
+        [self useSearch];
+}
+

 - (void) searchBarTextDidBeginEditing:(UISearchBar *)searchBar {
     [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)];
 - (void) searchBarTextDidBeginEditing:(UISearchBar *)searchBar {
     [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)];

+    [self clearData];
+    [self reloadData];

 }
 
 - (void) searchBarButtonClicked:(UISearchBar *)searchBar {
 }
 
 - (void) searchBarButtonClicked:(UISearchBar *)searchBar {

-    [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSearchedForBy:)];

     [search_ resignFirstResponder];
     [search_ resignFirstResponder];

-    [self reloadData];
+    [self useSearch];

 }
 
 - (void) searchBarCancelButtonClicked:(UISearchBar *)searchBar {
 }
 
 - (void) searchBarCancelButtonClicked:(UISearchBar *)searchBar {


@@ -7649,11 +7632,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (bool) shouldYield {
 }
 
 - (bool) shouldYield {

+    return YES;
+}
+
+- (bool) shouldBlock {

     return [self filter] == @selector(isUnfilteredAndSearchedForBy:);
 }
 
     return [self filter] == @selector(isUnfilteredAndSearchedForBy:);
 }
 

+- (bool) isSummarized {
+    return [self filter] == @selector(isUnfilteredAndSelectedForBy:);
+}
+
+- (bool) showsSections {
+    return false;
+}
+
+- (NSMutableArray *) _reloadPackages {
+    NSMutableArray *packages([super _reloadPackages]);
+    if ([self filter] == @selector(isUnfilteredAndSearchedForBy:))
+        [packages radixSortUsingSelector:@selector(rank)];
+    return packages;
+}
+

 - (id) initWithDatabase:(Database *)database query:(NSString *)query {
 - (id) initWithDatabase:(Database *)database query:(NSString *)query {

-    if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:query])) {
+    if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:[query componentsSeparatedByString:@" "]])) {

         search_ = [[[UISearchBar alloc] init] autorelease];
         [search_ setDelegate:self];
 
         search_ = [[[UISearchBar alloc] init] autorelease];
         [search_ setDelegate:self];
 


@@ -7684,7 +7686,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) reloadData {
 }
 
 - (void) reloadData {

-    [self setObject:[search_ text]];
+    id object([search_ text]);
+    if ([self filter] == @selector(isUnfilteredAndSearchedForBy:))
+        object = [object componentsSeparatedByString:@" "];
+
+    [self setObject:object];

     [self resetCursor];
 
     [super reloadData];
     [self resetCursor];
 
     [super reloadData];


@@ -7703,13 +7709,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UITableViewDelegate
 > {
     _transient Database *database_;
     UITableViewDelegate
 > {
     _transient Database *database_;

-    NSString *name_;
-    Package *package_;
-    UITableView *table_;
-    UISwitch *subscribedSwitch_;
-    UISwitch *ignoredSwitch_;
-    UITableViewCell *subscribedCell_;
-    UITableViewCell *ignoredCell_;
+    _H<NSString> name_;
+    _H<Package> package_;
+    _H<UITableView, 2> table_;
+    _H<UISwitch> subscribedSwitch_;
+    _H<UISwitch> ignoredSwitch_;
+    _H<UITableViewCell> subscribedCell_;
+    _H<UITableViewCell> ignoredCell_;

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


@@ -7718,16 +7724,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation PackageSettingsController
 
 
 @implementation PackageSettingsController
 

-- (void) dealloc {
-    [self releaseSubviews];
-    [name_ release];
-    [package_ release];
-
-    [super dealloc];
-}
-

 - (NSURL *) navigationURL {
 - (NSURL *) navigationURL {

-    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@/settings", [package_ id]]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@/settings", (id) name_]];

 }
 
 - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
 }
 
 - (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {


@@ -7823,26 +7821,26 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 

-    table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
+    table_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease];

     [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];

-    [table_ setDataSource:self];
+    [(UITableView *) table_ setDataSource:self];

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

-    subscribedSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
+    subscribedSwitch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)] autorelease];

     [subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
     [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged];
 
     [subscribedSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
     [subscribedSwitch_ addTarget:self action:@selector(onSubscribed:) forEvents:UIControlEventValueChanged];
 

-    ignoredSwitch_ = [[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)];
+    ignoredSwitch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(0, 0, 50, 20)] autorelease];

     [ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
     [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged];
 
     [ignoredSwitch_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
     [ignoredSwitch_ addTarget:self action:@selector(onIgnored:) forEvents:UIControlEventValueChanged];
 

-    subscribedCell_ = [[UITableViewCell alloc] init];
+    subscribedCell_ = [[[UITableViewCell alloc] init] autorelease];

     [subscribedCell_ setText:UCLocalize("SHOW_ALL_CHANGES")];
     [subscribedCell_ setAccessoryView:subscribedSwitch_];
     [subscribedCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
 
     [subscribedCell_ setText:UCLocalize("SHOW_ALL_CHANGES")];
     [subscribedCell_ setAccessoryView:subscribedSwitch_];
     [subscribedCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
 

-    ignoredCell_ = [[UITableViewCell alloc] init];
+    ignoredCell_ = [[[UITableViewCell alloc] init] autorelease];

     [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")];
     [ignoredCell_ setAccessoryView:ignoredSwitch_];
     [ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];
     [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")];
     [ignoredCell_ setAccessoryView:ignoredSwitch_];
     [ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone];


@@ -7855,38 +7853,28 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [ignoredCell_ release];

     ignoredCell_ = nil;
     ignoredCell_ = nil;

-
-    [subscribedCell_ release];

     subscribedCell_ = nil;
     subscribedCell_ = nil;

-
-    [table_ release];

     table_ = nil;
     table_ = nil;

-
-    [ignoredSwitch_ release];

     ignoredSwitch_ = nil;
     ignoredSwitch_ = nil;

-
-    [subscribedSwitch_ release];

     subscribedSwitch_ = nil;
     subscribedSwitch_ = nil;

+
+    [super releaseSubviews];

 }
 
 - (id) initWithDatabase:(Database *)database package:(NSString *)package {
     if ((self = [super init]) != nil) {
         database_ = database;
 }
 
 - (id) initWithDatabase:(Database *)database package:(NSString *)package {
     if ((self = [super init]) != nil) {
         database_ = database;

-        name_ = [package retain];
+        name_ = package;

     } return self;
 }
 
 - (void) reloadData {
     [super reloadData];
 
     } return self;
 }
 
 - (void) reloadData {
     [super reloadData];
 

-    if (package_ != nil)
-        [package_ autorelease];

     package_ = [database_ packageWithName:name_];
 
     if (package_ != nil) {
     package_ = [database_ packageWithName:name_];
 
     if (package_ != nil) {

-        package_ = [package_ retain];

         [subscribedSwitch_ setOn:([package_ subscribed] ? 1 : 0) animated:NO];
         [ignoredSwitch_ setOn:([package_ ignored] ? 1 : 0) animated:NO];
     } // XXX: what now, G?
         [subscribedSwitch_ setOn:([package_ subscribed] ? 1 : 0) animated:NO];
         [ignoredSwitch_ setOn:([package_ ignored] ? 1 : 0) animated:NO];
     } // XXX: what now, G?


@@ -7911,10 +7899,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation InstalledController
 
 
 @implementation InstalledController
 

-- (void) dealloc {
-    [super dealloc];
-}
-

 - (NSURL *) navigationURL {
     return [NSURL URLWithString:@"cydia://installed"];
 }
 - (NSURL *) navigationURL {
     return [NSURL URLWithString:@"cydia://installed"];
 }


@@ -7971,12 +7955,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* }}} */
 
 /* Source Cell {{{ */
 /* }}} */
 
 /* Source Cell {{{ */

-@interface SourceCell : CYTableViewCell <
-    ContentDelegate
+@interface SourceCell : CyteTableViewCell <
+    CyteTableViewCellDelegate

 > {
 > {

-    UIImage *icon_;
-    NSString *origin_;
-    NSString *label_;
+    _H<UIImage> icon_;
+    _H<NSString> origin_;
+    _H<NSString> label_;

 }
 
 - (void) setSource:(Source *)source;
 }
 
 - (void) setSource:(Source *)source;


@@ -7985,34 +7969,44 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation SourceCell
 
 
 @implementation SourceCell
 

-- (void) clearSource {
-    [icon_ release];
-    [origin_ release];
-    [label_ release];
+- (void) _setImage:(UIImage *)image {
+    icon_ = image;
+    [content_ setNeedsDisplay];
+}
+
+- (void) _setSource:(Source *)source {
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);

 
 

-    icon_ = nil;
-    origin_ = nil;
-    label_ = nil;
+    if (NSString *base = [source base])
+        if ([base length] != 0) {
+            NSURL *url([NSURL URLWithString:[base stringByAppendingString:@"CydiaIcon.png"]]);
+
+            if (NSData *data = [NSURLConnection
+                sendSynchronousRequest:[NSURLRequest
+                    requestWithURL:url
+                    //cachePolicy:NSURLRequestUseProtocolCachePolicy
+                    //timeoutInterval:5
+                ]
+
+                returningResponse:NULL
+                error:NULL
+            ])
+                if (UIImage *image = [UIImage imageWithData:data])
+                    [self performSelectorOnMainThread:@selector(_setImage:) withObject:image waitUntilDone:NO];
+        }
+
+    [pool release];

 }
 
 - (void) setSource:(Source *)source {
 }
 
 - (void) setSource:(Source *)source {

-    [self clearSource];
-
-    if (icon_ == nil)
-        icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]];
-    if (icon_ == nil)
-        icon_ = [UIImage applicationImageNamed:@"unknown.png"];
-    icon_ = [icon_ retain];
+    icon_ = [UIImage applicationImageNamed:@"unknown.png"];

 
 

-    origin_ = [[source name] retain];
-    label_ = [[source uri] retain];
+    origin_ = [source name];
+    label_ = [source uri];

 
     [content_ setNeedsDisplay];
 
     [content_ setNeedsDisplay];

-}

 
 

-- (void) dealloc {
-    [self clearSource];
-    [super dealloc];
+    [NSThread detachNewThreadSelector:@selector(_setSource:) toTarget:self withObject:source];

 }
 
 - (SourceCell *) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
 }
 
 - (SourceCell *) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {


@@ -8020,7 +8014,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         UIView *content([self contentView]);
         CGRect bounds([content bounds]);
 
         UIView *content([self contentView]);
         CGRect bounds([content bounds]);
 

-        content_ = [[ContentView alloc] initWithFrame:bounds];
+        content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease];

         [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [content_ setBackgroundColor:[UIColor whiteColor]];
         [content addSubview:content_];
         [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
         [content_ setBackgroundColor:[UIColor whiteColor]];
         [content addSubview:content_];


@@ -8058,7 +8052,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* Source Controller {{{ */
 @interface SourceController : FilteredPackageListController {
     _transient Source *source_;
 /* Source Controller {{{ */
 @interface SourceController : FilteredPackageListController {
     _transient Source *source_;

-    NSString *key_;
+    _H<NSString> key_;

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


@@ -8068,20 +8062,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @implementation SourceController
 
 - (NSURL *) navigationURL {
 @implementation SourceController
 
 - (NSURL *) navigationURL {

-    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [source_ name]]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://sources/%@", [key_ stringByAddingPercentEscapesIncludingReserved]]];

 }
 
 - (id) initWithDatabase:(Database *)database source:(Source *)source {
     if ((self = [super initWithDatabase:database title:[source label] filter:@selector(isVisibleInSource:) with:source]) != nil) {
         source_ = source;
 }
 
 - (id) initWithDatabase:(Database *)database source:(Source *)source {
     if ((self = [super initWithDatabase:database title:[source label] filter:@selector(isVisibleInSource:) with:source]) != nil) {
         source_ = source;

-        key_ = [[source key] retain];
+        key_ = [source key];

     } return self;
 }
 
 - (void) reloadData {
     source_ = [database_ sourceWithKey:key_];
     } return self;
 }
 
 - (void) reloadData {
     source_ = [database_ sourceWithKey:key_];

-    [key_ release];
-    key_ = [[source_ key] retain];
+    key_ = [source_ key];

     [self setObject:source_];
 
     [[self navigationItem] setTitle:[source_ label]];
     [self setObject:source_];
 
     [[self navigationItem] setTitle:[source_ label]];


@@ -8097,13 +8090,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UITableViewDelegate
 > {
     _transient Database *database_;
     UITableViewDelegate
 > {
     _transient Database *database_;

-    UITableView *list_;
-    NSMutableArray *sources_;
+    _H<UITableView, 2> list_;
+    _H<NSMutableArray> sources_;

     int offset_;
 
     int offset_;
 

-    NSString *href_;
-    UIProgressHUD *hud_;
-    NSError *error_;
+    _H<NSString> href_;
+    _H<UIProgressHUD> hud_;
+    _H<NSError> error_;

 
     //NSURLConnection *installer_;
     NSURLConnection *trivial_;
 
     //NSURLConnection *installer_;
     NSURLConnection *trivial_;


@@ -8130,19 +8123,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) dealloc {
 }
 
 - (void) dealloc {

-    [self releaseSubviews];
-
-    [href_ release];
-    [hud_ release];
-    [error_ release];
-

     //[self _releaseConnection:installer_];
     [self _releaseConnection:trivial_];
     [self _releaseConnection:trivial_gz_];
     [self _releaseConnection:trivial_bz2_];
     //[self _releaseConnection:automatic_];
 
     //[self _releaseConnection:installer_];
     [self _releaseConnection:trivial_];
     [self _releaseConnection:trivial_gz_];
     [self _releaseConnection:trivial_bz2_];
     //[self _releaseConnection:automatic_];
 

-    [sources_ release];

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


@@ -8272,7 +8258,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [delegate_ releaseNetworkActivityIndicator];
 
         [delegate_ removeProgressHUD:hud_];
         [delegate_ releaseNetworkActivityIndicator];
 
         [delegate_ removeProgressHUD:hud_];

-        [hud_ autorelease];

         hud_ = nil;
 
         bool defer(false);
         hud_ = nil;
 
         bool defer(false);


@@ -8320,15 +8305,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             [alert show];
         }
 
             [alert show];
         }
 

-        if (!defer) {
-            [href_ release];
-            href_ = nil;
-        }
-
-        if (error_ != nil) {
-            [error_ release];
-            error_ = nil;
-        }
+        href_ = nil;
+        error_ = nil;

     }
 }
 
     }
 }
 


@@ -8341,8 +8319,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
     lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
 
 - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
     lprintf("connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);

-    if (error_ != nil)
-        error_ = [error retain];
+    error_ = error;

     [self _endConnection:connection];
 }
 
     [self _endConnection:connection];
 }
 


@@ -8351,8 +8328,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
 }
 
 - (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {

+    NSURL *url([NSURL URLWithString:href]);
+

     NSMutableURLRequest *request = [NSMutableURLRequest
     NSMutableURLRequest *request = [NSMutableURLRequest

-        requestWithURL:[NSURL URLWithString:href]
+        requestWithURL:url

         cachePolicy:NSURLRequestUseProtocolCachePolicy
         timeoutInterval:120.0
     ];
         cachePolicy:NSURLRequestUseProtocolCachePolicy
         timeoutInterval:120.0
     ];


@@ -8361,8 +8340,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if (Machine_ != NULL)
         [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
 
     if (Machine_ != NULL)
         [request setValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];

-    if (UniqueID_ != nil)
-        [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+
+    if ([url isCydiaSecure]) {
+        if (UniqueID_ != nil)
+            [request setValue:UniqueID_ forHTTPHeaderField:@"X-Unique-ID"];
+    }

 
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }


@@ -8381,7 +8363,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                     href_ = [href stringByAppendingString:@"/"];
                 else
                     href_ = href;
                     href_ = [href stringByAppendingString:@"/"];
                 else
                     href_ = href;

-                href_ = [href_ retain];

 
                 trivial_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages"] method:@"HEAD"] retain];
                 trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
 
                 trivial_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages"] method:@"HEAD"] retain];
                 trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];


@@ -8391,7 +8372,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 cydia_ = false;
 
                 // XXX: this is stupid
                 cydia_ = false;
 
                 // XXX: this is stupid

-                hud_ = [[delegate_ addProgressHUD] retain];
+                hud_ = [delegate_ addProgressHUD];

                 [hud_ setText:UCLocalize("VERIFYING_URL")];
                 [delegate_ retainNetworkActivityIndicator];
             } break;
                 [hud_ setText:UCLocalize("VERIFYING_URL")];
                 [delegate_ retainNetworkActivityIndicator];
             } break;


@@ -8419,7 +8400,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             _nodefault
         }
 
             _nodefault
         }
 

-        [href_ release];

         href_ = nil;
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
         href_ = nil;
 
         [alert dismissWithClickedButtonIndex:-1 animated:YES];


@@ -8429,10 +8409,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 

-    list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
+    list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease];

     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:56];
     [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [list_ setRowHeight:56];

-    [list_ setDataSource:self];
+    [(UITableView *) list_ setDataSource:self];

     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }
     [list_ setDelegate:self];
     [[self view] addSubview:list_];
 }


@@ -8445,14 +8425,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [list_ release];

     list_ = nil;
     list_ = nil;

+
+    sources_ = nil;
+
+    [super releaseSubviews];

 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;
 }
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;

-        sources_ = [[NSMutableArray arrayWithCapacity:16] retain];

     } return self;
 }
 
     } return self;
 }
 


@@ -8463,7 +8445,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if ([database_ popErrorWithTitle:UCLocalize("SOURCES") forOperation:list.ReadMainList()])
         return;
 
     if ([database_ popErrorWithTitle:UCLocalize("SOURCES") forOperation:list.ReadMainList()])
         return;
 

-    [sources_ removeAllObjects];
+    sources_ = [NSMutableArray arrayWithCapacity:16];

     [sources_ addObjectsFromArray:[database_ sources]];
     _trace();
     [sources_ sortUsingSelector:@selector(compareByNameAndType:)];
     [sources_ addObjectsFromArray:[database_ sources]];
     _trace();
     [sources_ sortUsingSelector:@selector(compareByNameAndType:)];


@@ -8494,7 +8476,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ] autorelease];
 
     [alert setContext:@"source"];
     ] autorelease];
 
     [alert setContext:@"source"];

-    [alert setTransform:CGAffineTransformTranslate([alert transform], 0.0, 100.0)];

 
     [alert setNumberOfRows:1];
     [alert addTextFieldWithValue:@"http://" label:@""];
 
     [alert setNumberOfRows:1];
     [alert addTextFieldWithValue:@"http://" label:@""];


@@ -8558,9 +8539,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     _transient Database *database_;
     // XXX: ok, "roledelegate_"?...
     _transient id roledelegate_;
     _transient Database *database_;
     // XXX: ok, "roledelegate_"?...
     _transient id roledelegate_;

-    UITableView *table_;
-    UISegmentedControl *segment_;
-    UIView *container_;
+    _H<UITableView, 2> table_;
+    _H<UISegmentedControl> segment_;
+    _H<UIView> container_;

 }
 
 - (void) showDoneButton;
 }
 
 - (void) showDoneButton;


@@ -8570,19 +8551,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 @implementation SettingsController
 
 
 @implementation SettingsController
 

-- (void) dealloc {
-    [self releaseSubviews];
-
-    [super dealloc];
-}
-

 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
 

-    table_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped];
+    table_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStyleGrouped] autorelease];

     [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [table_ setDelegate:self];
     [table_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
     [table_ setDelegate:self];

-    [table_ setDataSource:self];
+    [(UITableView *) table_ setDataSource:self];

     [[self view] addSubview:table_];
 
     NSArray *items = [NSArray arrayWithObjects:
     [[self view] addSubview:table_];
 
     NSArray *items = [NSArray arrayWithObjects:


@@ -8590,8 +8565,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         UCLocalize("HACKER"),
         UCLocalize("DEVELOPER"),
     nil];
         UCLocalize("HACKER"),
         UCLocalize("DEVELOPER"),
     nil];

-    segment_ = [[UISegmentedControl alloc] initWithItems:items];
-    container_ = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)];
+    segment_ = [[[UISegmentedControl alloc] initWithItems:items] autorelease];
+    container_ = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, 44.0f)] autorelease];

     [container_ addSubview:segment_];
 }
 
     [container_ addSubview:segment_];
 }
 


@@ -8614,14 +8589,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [table_ release];

     table_ = nil;
     table_ = nil;

-
-    [segment_ release];

     segment_ = nil;
     segment_ = nil;

-
-    [container_ release];

     container_ = nil;
     container_ = nil;

+
+    [super releaseSubviews];

 }
 
 - (id) initWithDatabase:(Database *)database delegate:(id)delegate {
 }
 
 - (id) initWithDatabase:(Database *)database delegate:(id)delegate {


@@ -8752,21 +8724,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 /* }}} */
 /* Stash Controller {{{ */
 @interface StashController : CyteViewController {
 /* }}} */
 /* Stash Controller {{{ */
 @interface StashController : CyteViewController {

-    UIActivityIndicatorView *spinner_;
-    UILabel *status_;
-    UILabel *caption_;
+    _H<UIActivityIndicatorView> spinner_;
+    _H<UILabel> status_;
+    _H<UILabel> caption_;

 }
 
 @end
 
 @implementation StashController
 
 }
 
 @end
 
 @implementation StashController
 

-- (void) dealloc {
-    [self releaseSubviews];
-
-    [super dealloc];
-}
-

 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
     [[self view] setBackgroundColor:[UIColor viewFlipsideBackgroundColor]];
 - (void) loadView {
     [self setView:[[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]];
     [[self view] setBackgroundColor:[UIColor viewFlipsideBackgroundColor]];


@@ -8812,14 +8778,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) releaseSubviews {
 }
 
 - (void) releaseSubviews {

-    [spinner_ release];

     spinner_ = nil;
     spinner_ = nil;

-
-    [status_ release];

     status_ = nil;
     status_ = nil;

-
-    [caption_ release];

     caption_ = nil;
     caption_ = nil;

+
+    [super releaseSubviews];

 }
 
 @end
 }
 
 @end


@@ -8852,6 +8815,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 #endif
 }
 
 #endif
 }
 

+- (void) storeCachedResponse:(NSCachedURLResponse *)cached forRequest:(NSURLRequest *)request {
+    if (NSURLResponse *response = [cached response])
+        if (NSString *mime = [response MIMEType])
+            if ([mime isEqualToString:@"text/cache-manifest"]) {
+                NSURL *url([response URL]);
+
+#if !ForRelease
+                NSLog(@"###: %@", [url absoluteString]);
+#endif
+
+                @synchronized (HostConfig_) {
+                    [CachedURLs_ addObject:url];
+                }
+            }
+
+    [super storeCachedResponse:cached forRequest:request];
+}
+

 @end
 
 @interface Cydia : UIApplication <
 @end
 
 @interface Cydia : UIApplication <


@@ -8861,23 +8842,21 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UINavigationControllerDelegate,
     UITabBarControllerDelegate
 > {
     UINavigationControllerDelegate,
     UITabBarControllerDelegate
 > {

-    // XXX: evaluate all fields for _transient
-
-    UIWindow *window_;
-    CYTabBarController *tabbar_;
-    CYEmulatedLoadingController *emulated_;
+    _H<UIWindow> window_;
+    _H<CYTabBarController> tabbar_;
+    _H<CydiaLoadingViewController> emulated_;

 
 

-    NSMutableArray *essential_;
-    NSMutableArray *broken_;
+    _H<NSMutableArray> essential_;
+    _H<NSMutableArray> broken_;

 
     Database *database_;
 
 
     Database *database_;
 

-    NSURL *starturl_;
+    _H<NSURL> starturl_;

 
     unsigned locked_;
     unsigned activity_;
 
 
     unsigned locked_;
     unsigned activity_;
 

-    StashController *stash_;
+    _H<StashController> stash_;

 
     bool loaded_;
 }
 
     bool loaded_;
 }


@@ -8932,6 +8911,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 }
 
     }
 }
 

+- (void) returnToCydia {
+    [self _loaded];
+}
+

 - (void) _saveConfig {
     _trace();
     MetaFile_.Sync();
 - (void) _saveConfig {
     _trace();
     MetaFile_.Sync();


@@ -8952,6 +8935,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
             NSLog(@"failure to serialize metadata: %@", error);
         }
     }
             NSLog(@"failure to serialize metadata: %@", error);
         }
     }

+
+    WriteSources();

 }
 
 // Navigation controller for the queuing badge.
 }
 
 // Navigation controller for the queuing badge.


@@ -8966,7 +8951,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) _updateData {
     [self _saveConfig];
 
 - (void) _updateData {
     [self _saveConfig];

-

     [self unloadData];
 
     UINavigationController *navigation = [self queueNavigationController];
     [self unloadData];
 
     UINavigationController *navigation = [self queueNavigationController];


@@ -8994,37 +8978,36 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     //  - We already auto-refreshed this launch.
     //  - Auto-refresh is disabled.
     if (recently || loaded_ || ManualRefresh) {
     //  - We already auto-refreshed this launch.
     //  - Auto-refresh is disabled.
     if (recently || loaded_ || ManualRefresh) {

-        [self performSelectorOnMainThread:@selector(_loaded) withObject:nil waitUntilDone:NO];
-

         // If we are cancelling, we need to make sure it knows it's already loaded.
         loaded_ = true;
         // If we are cancelling, we need to make sure it knows it's already loaded.
         loaded_ = true;

-        return;
+
+        [self performSelectorOnMainThread:@selector(_loaded) withObject:nil waitUntilDone:NO];

     } else {
         // We are going to load, so remember that.
         loaded_ = true;
     } else {
         // We are going to load, so remember that.
         loaded_ = true;

-    }

 
 

-    SCNetworkReachabilityFlags flags; {
-        SCNetworkReachabilityRef reachability(SCNetworkReachabilityCreateWithName(NULL, "cydia.saurik.com"));
-        SCNetworkReachabilityGetFlags(reachability, &flags);
-        CFRelease(reachability);
-    }
+        SCNetworkReachabilityFlags flags; {
+            SCNetworkReachabilityRef reachability(SCNetworkReachabilityCreateWithName(NULL, "cydia.saurik.com"));
+            SCNetworkReachabilityGetFlags(reachability, &flags);
+            CFRelease(reachability);
+        }

 
 

-    // XXX: this elaborate mess is what Apple is using to determine this? :(
-    // XXX: do we care if the user has to intervene? maybe that's ok?
-    bool reachable(
-        (flags & kSCNetworkReachabilityFlagsReachable) != 0 && (
-            (flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0 || (
-                (flags & kSCNetworkReachabilityFlagsConnectionOnDemand) != 0 ||
-                (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0
-            ) && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0 ||
-            (flags & kSCNetworkReachabilityFlagsIsWWAN) != 0
-        )
-    );
+        // XXX: this elaborate mess is what Apple is using to determine this? :(
+        // XXX: do we care if the user has to intervene? maybe that's ok?
+        bool reachable(
+            (flags & kSCNetworkReachabilityFlagsReachable) != 0 && (
+                (flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0 || (
+                    (flags & kSCNetworkReachabilityFlagsConnectionOnDemand) != 0 ||
+                    (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0
+                ) && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0 ||
+                (flags & kSCNetworkReachabilityFlagsIsWWAN) != 0
+            )
+        );

 
 

-    // If we can reach the server, auto-refresh!
-    if (reachable)
-        [tabbar_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO];
+        // If we can reach the server, auto-refresh!
+        if (reachable)
+            [tabbar_ performSelectorOnMainThread:@selector(setUpdate:) withObject:update waitUntilDone:NO];
+    }

 
     [pool release];
 }
 
     [pool release];
 }


@@ -9033,7 +9016,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [NSThread detachNewThreadSelector:@selector(_refreshIfPossible:) toTarget:self withObject:[Metadata_ objectForKey:@"LastUpdate"]];
 }
 
     [NSThread detachNewThreadSelector:@selector(_refreshIfPossible:) toTarget:self withObject:[Metadata_ objectForKey:@"LastUpdate"]];
 }
 

-- (void) _reloadDataWithInvocation:(NSInvocation *)invocation {
+- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
+@synchronized (self) {

     UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
     [hud setText:UCLocalize("RELOADING_DATA")];
 
     UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
     [hud setText:UCLocalize("RELOADING_DATA")];
 


@@ -9058,8 +9042,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         }
     }
 
         }
     }
 

-    NSLog(@"changes:#%u", changes);
-

     UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:2] tabBarItem];
     if (changes != 0) {
         _trace();
     UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:2] tabBarItem];
     if (changes != 0) {
         _trace();


@@ -9075,9 +9057,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 
     [self _updateData];
     }
 
     [self _updateData];

-
-    [self refreshIfPossible];
-}
+} }

 
 - (void) updateData {
     [self _updateData];
 
 - (void) updateData {
     [self _updateData];


@@ -9085,12 +9065,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) update_ {
     [database_ update];
 
 - (void) update_ {
     [database_ update];

-}
-
-- (void) complete {
-    @synchronized (self) {
-        [self _reloadDataWithInvocation:nil];
-    }
+    [self performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];

 }
 
 - (void) disemulate {
 }
 
 - (void) disemulate {


@@ -9099,7 +9074,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [window_ addSubview:[tabbar_ view]];
     [[emulated_ view] removeFromSuperview];
 
     [window_ addSubview:[tabbar_ view]];
     [[emulated_ view] removeFromSuperview];

-    [emulated_ release];

     emulated_ = nil;
     [window_ setUserInteractionEnabled:YES];
 }
     emulated_ = nil;
     [window_ setUserInteractionEnabled:YES];
 }


@@ -9148,47 +9122,31 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self performSelectorOnMainThread:@selector(repairWithInvocation:) withObject:[NSInvocation invocationWithSelector:selector forTarget:database_] waitUntilDone:YES];
 }
 
     [self performSelectorOnMainThread:@selector(repairWithInvocation:) withObject:[NSInvocation invocationWithSelector:selector forTarget:database_] waitUntilDone:YES];
 }
 

+- (void) reloadData {
+    [self reloadDataWithInvocation:nil];
+    if ([database_ progressDelegate] == nil)
+        [self _loaded];
+}
+

 - (void) syncData {
     [self _saveConfig];
 - (void) syncData {
     [self _saveConfig];

-
-    FILE *file(fopen("/etc/apt/sources.list.d/cydia.list", "w"));
-    _assert(file != NULL);
-
-    for (NSString *key in [Sources_ allKeys]) {
-        NSDictionary *source([Sources_ objectForKey:key]);
-
-        fprintf(file, "%s %s %s\n",
-            [[source objectForKey:@"Type"] UTF8String],
-            [[source objectForKey:@"URI"] UTF8String],
-            [[source objectForKey:@"Distribution"] UTF8String]
-        );
-    }
-
-    fclose(file);
-

     [self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:@"UPDATING_SOURCES"];
     [self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:@"UPDATING_SOURCES"];

-
-    [self complete];

 }
 
 }
 

-- (void) addTrivialSource:(NSString *)href {
-    [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
-        @"deb", @"Type",
-        href, @"URI",
-        @"./", @"Distribution",
-    nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href]];
+- (void) addSource:(NSDictionary *) source {
+    AddSource(source);
+}

 
 

-    Changed_ = true;
+- (void) addSource:(NSString *)href withDistribution:(NSString *)distribution andSections:(NSArray *)sections {
+    AddSource(href, distribution, sections);

 }
 
 }
 

-- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
-    @synchronized (self) {
-        [self _reloadDataWithInvocation:invocation];
-    }
+- (void) addTrivialSource:(NSString *)href {
+    AddSource(href, @"./");

 }
 
 }
 

-- (void) reloadData {
-    [self reloadDataWithInvocation:nil];
+- (void) updateValues {
+    Changed_ = true;

 }
 
 - (void) resolve {
 }
 
 - (void) resolve {


@@ -9268,12 +9226,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 }
 
     }
 }
 

+- (void) perform_ {
+    [database_ perform];
+    [self performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES];
+}
+

 - (void) confirmWithNavigationController:(UINavigationController *)navigation {
     Queuing_ = false;
     ++locked_;
 - (void) confirmWithNavigationController:(UINavigationController *)navigation {
     Queuing_ = false;
     ++locked_;

-    [self detachNewProgressSelector:@selector(perform) toTarget:database_ forController:navigation title:@"RUNNING"];
+    [self detachNewProgressSelector:@selector(perform_) toTarget:self forController:navigation title:@"RUNNING"];

     --locked_;
     --locked_;

-    [self complete];
+    [self refreshIfPossible];

 }
 
 - (void) showSettings {
 }
 
 - (void) showSettings {


@@ -9327,7 +9290,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } else if ([context isEqualToString:@"fixhalf"]) {
         if (button == [alert cancelButtonIndex]) {
             @synchronized (self) {
     } else if ([context isEqualToString:@"fixhalf"]) {
         if (button == [alert cancelButtonIndex]) {
             @synchronized (self) {

-                for (Package *broken in broken_) {
+                for (Package *broken in (id) broken_) {

                     [broken remove];
 
                     NSString *id = [broken id];
                     [broken remove];
 
                     NSString *id = [broken id];


@@ -9349,7 +9312,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } else if ([context isEqualToString:@"upgrade"]) {
         if (button == [alert firstOtherButtonIndex]) {
             @synchronized (self) {
     } else if ([context isEqualToString:@"upgrade"]) {
         if (button == [alert firstOtherButtonIndex]) {
             @synchronized (self) {

-                for (Package *essential in essential_)
+                for (Package *essential in (id) essential_)

                     [essential install];
 
                 [self resolve];
                     [essential install];
 
                 [self resolve];


@@ -9365,10 +9328,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 }
 
     }
 }
 

-- (void) system:(NSString *)command { _pooled
+- (void) system:(NSString *)command {
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+

     _trace();
     system([command UTF8String]);
     _trace();
     _trace();
     system([command UTF8String]);
     _trace();

+
+    [pool release];

 }
 
 - (void) applicationWillSuspend {
 }
 
 - (void) applicationWillSuspend {


@@ -9423,7 +9390,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (UIProgressHUD *) addProgressHUD {
 }
 
 - (UIProgressHUD *) addProgressHUD {

-    UIProgressHUD *hud([[[UIProgressHUD alloc] initWithWindow:window_] autorelease]);
+    UIProgressHUD *hud([[[UIProgressHUD alloc] init] autorelease]);

     [hud setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 
     [window_ setUserInteractionEnabled:NO];
     [hud setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 
     [window_ setUserInteractionEnabled:NO];


@@ -9435,7 +9402,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     UIView *view([target view]);
     [view addSubview:hud];
 
     UIView *view([target view]);
     [view addSubview:hud];
 

-    [hud show:YES];
+    [hud showInView:[tabbar_ view]];

 
     ++locked_;
     return hud;
 
     ++locked_;
     return hud;


@@ -9443,7 +9410,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) removeProgressHUD:(UIProgressHUD *)hud {
     --locked_;
 
 - (void) removeProgressHUD:(UIProgressHUD *)hud {
     --locked_;

-    [hud show:NO];
+    [hud hide];

     [hud removeFromSuperview];
     [window_ setUserInteractionEnabled:YES];
 }
     [hud removeFromSuperview];
     [window_ setUserInteractionEnabled:YES];
 }


@@ -9523,7 +9490,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                 controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
                 [(SourcesController *)controller showAddSourcePrompt];
             } else {
                 controller = [[[SourcesController alloc] initWithDatabase:database_] autorelease];
                 [(SourcesController *)controller showAddSourcePrompt];
             } else {

-                Source *source = [database_ sourceWithKey:argument];
+                Source *source = [database_ sourceWithKey:[argument stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];

                 controller = [[[SourceController alloc] initWithDatabase:database_ source:source] autorelease];
             }
         }
                 controller = [[[SourceController alloc] initWithDatabase:database_ source:source] autorelease];
             }
         }


@@ -9567,8 +9534,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (void) applicationOpenURL:(NSURL *)url {
     [super applicationOpenURL:url];
 
 - (void) applicationOpenURL:(NSURL *)url {
     [super applicationOpenURL:url];
 

-    if (!loaded_) starturl_ = [url retain];
-    else [self openCydiaURL:url forExternal:YES];
+    if (!loaded_)
+        starturl_ = url;
+    else
+        [self openCydiaURL:url forExternal:YES];

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


@@ -9580,15 +9549,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [super applicationWillResignActive:application];
 }
 
         [super applicationWillResignActive:application];
 }
 

-- (void) applicationWillTerminate:(UIApplication *)application {
-    Changed_ = true;
+- (void) saveState {

     [Metadata_ setObject:[tabbar_ navigationURLCollection] forKey:@"InterfaceState"];
     [Metadata_ setObject:[NSDate date] forKey:@"LastClosed"];
     [Metadata_ setObject:[NSNumber numberWithInt:[tabbar_ selectedIndex]] forKey:@"InterfaceIndex"];
     [Metadata_ setObject:[tabbar_ navigationURLCollection] forKey:@"InterfaceState"];
     [Metadata_ setObject:[NSDate date] forKey:@"LastClosed"];
     [Metadata_ setObject:[NSNumber numberWithInt:[tabbar_ selectedIndex]] forKey:@"InterfaceIndex"];

+    Changed_ = true;

 
     [self _saveConfig];
 }
 
 
     [self _saveConfig];
 }
 

+- (void) applicationWillTerminate:(UIApplication *)application {
+    [self saveState];
+}
+

 - (void) setConfigurationData:(NSString *)data {
     static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) setConfigurationData:(NSString *)data {
     static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 


@@ -9618,13 +9591,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) addStashController {
     ++locked_;
 
 - (void) addStashController {
     ++locked_;

-    stash_ = [[StashController alloc] init];
+    stash_ = [[[StashController alloc] init] autorelease];

     [window_ addSubview:[stash_ view]];
 }
 
 - (void) removeStashController {
     [[stash_ view] removeFromSuperview];
     [window_ addSubview:[stash_ view]];
 }
 
 - (void) removeStashController {
     [[stash_ view] removeFromSuperview];

-    [stash_ release];
+    stash_ = nil;

     --locked_;
 }
 
     --locked_;
 }
 


@@ -9645,7 +9618,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) setupViewControllers {
 }
 
 - (void) setupViewControllers {

-    tabbar_ = [[CYTabBarController alloc] initWithDatabase:database_];
+    tabbar_ = [[[CYTabBarController alloc] initWithDatabase:database_] autorelease];

 
     NSMutableArray *items([NSMutableArray arrayWithObjects:
         [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease],
 
     NSMutableArray *items([NSMutableArray arrayWithObjects:
         [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease],


@@ -9672,7 +9645,20 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [tabbar_ setUpdateDelegate:self];
 }
 
     [tabbar_ setUpdateDelegate:self];
 }
 

+- (void) _sendMemoryWarningNotification {
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"UIApplicationDidReceiveMemoryWarningNotification" object:[UIApplication sharedApplication]];
+}
+
+- (void) _sendMemoryWarningNotifications {
+    while (true) {
+        [self performSelectorOnMainThread:@selector(_sendMemoryWarningNotification) withObject:nil waitUntilDone:NO];
+        usleep(250000);
+    }
+}
+

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

+    //[NSThread detachNewThreadSelector:@selector(_sendMemoryWarningNotifications) toTarget:self withObject:nil];
+

 _trace();
     if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
         [self setApplicationSupportsShakeToEdit:NO];
 _trace();
     if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)])
         [self setApplicationSupportsShakeToEdit:NO];


@@ -9694,19 +9680,19 @@ _trace();
     // this would disallow http{,s} URLs from accessing this data
     //[WebView registerURLSchemeAsLocal:@"cydia"];
 
     // this would disallow http{,s} URLs from accessing this data
     //[WebView registerURLSchemeAsLocal:@"cydia"];
 

-    Font12_ = [[UIFont systemFontOfSize:12] retain];
-    Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
-    Font14_ = [[UIFont systemFontOfSize:14] retain];
-    Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain];
-    Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain];
+    Font12_ = [UIFont systemFontOfSize:12];
+    Font12Bold_ = [UIFont boldSystemFontOfSize:12];
+    Font14_ = [UIFont systemFontOfSize:14];
+    Font18Bold_ = [UIFont boldSystemFontOfSize:18];
+    Font22Bold_ = [UIFont boldSystemFontOfSize:22];

 
 

-    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
-    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+    essential_ = [NSMutableArray arrayWithCapacity:4];
+    broken_ = [NSMutableArray arrayWithCapacity:4];

 
     // XXX: I really need this thing... like, seriously... I'm sorry
 
     // XXX: I really need this thing... like, seriously... I'm sorry

-    [[[CydiaWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] reloadData];
+    [[[AppCacheController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] reloadData];

 
 

-    window_ = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    window_ = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];

     [window_ orderFront:self];
     [window_ makeKey:self];
     [window_ setHidden:NO];
     [window_ orderFront:self];
     [window_ makeKey:self];
     [window_ setHidden:NO];


@@ -9737,7 +9723,7 @@ _trace();
     [window_ setUserInteractionEnabled:NO];
     [self setupViewControllers];
 
     [window_ setUserInteractionEnabled:NO];
     [self setupViewControllers];
 

-    emulated_ = [[CYEmulatedLoadingController alloc] initWithDatabase:database_];
+    emulated_ = [[[CydiaLoadingViewController alloc] init] autorelease];

     [window_ addSubview:[emulated_ view]];
 
     [self performSelector:@selector(loadData) withObject:nil afterDelay:0];
     [window_ addSubview:[emulated_ view]];
 
     [self performSelector:@selector(loadData) withObject:nil afterDelay:0];


@@ -9771,7 +9757,8 @@ _trace();
         [window_ setUserInteractionEnabled:NO];
     }
 
         [window_ setUserInteractionEnabled:NO];
     }
 

-    [self reloadData];
+    [self reloadDataWithInvocation:nil];
+    [self refreshIfPossible];

     PrintTimes();
 
     [self disemulate];
     PrintTimes();
 
     [self disemulate];


@@ -9837,7 +9824,6 @@ _trace();
     // (Try to) show the startup URL.
     if (starturl_ != nil) {
         [self openCydiaURL:starturl_ forExternal:NO];
     // (Try to) show the startup URL.
     if (starturl_ != nil) {
         [self openCydiaURL:starturl_ forExternal:NO];

-        [starturl_ release];

         starturl_ = nil;
     }
 }
         starturl_ = nil;
     }
 }


@@ -9934,6 +9920,8 @@ MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest
     NSMutableURLRequest *copy([request mutableCopy]);
 
     NSURL *url([copy URL]);
     NSMutableURLRequest *copy([request mutableCopy]);
 
     NSURL *url([copy URL]);

+
+    NSString *href([url absoluteString]);

     NSString *host([url host]);
     NSString *scheme([[url scheme] lowercaseString]);
 
     NSString *host([url host]);
     NSString *scheme([[url scheme] lowercaseString]);
 


@@ -9943,13 +9931,29 @@ MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest
         if ([copy respondsToSelector:@selector(setHTTPShouldUsePipelining:)])
             if ([PipelinedHosts_ containsObject:host] || [PipelinedHosts_ containsObject:compound])
                 [copy setHTTPShouldUsePipelining:YES];
         if ([copy respondsToSelector:@selector(setHTTPShouldUsePipelining:)])
             if ([PipelinedHosts_ containsObject:host] || [PipelinedHosts_ containsObject:compound])
                 [copy setHTTPShouldUsePipelining:YES];

+
+        if (NSString *control = [copy valueForHTTPHeaderField:@"Cache-Control"])
+            if ([control isEqualToString:@"max-age=0"])
+                if ([CachedURLs_ containsObject:href]) {
+#if !ForRelease
+                    NSLog(@"~~~: %@", href);
+#endif
+
+                    [copy setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
+
+                    [copy setValue:nil forHTTPHeaderField:@"Cache-Control"];
+                    [copy setValue:nil forHTTPHeaderField:@"If-Modified-Since"];
+                    [copy setValue:nil forHTTPHeaderField:@"If-None-Match"];
+                }

     }
 
     if ((self = _NSURLConnection$init$(self, _cmd, copy, delegate, usesCache, maxContentLength, startImmediately, connectionProperties)) != nil) {
     } return self;
 }
 
     }
 
     if ((self = _NSURLConnection$init$(self, _cmd, copy, delegate, usesCache, maxContentLength, startImmediately, connectionProperties)) != nil) {
     } return self;
 }
 

-int main(int argc, char *argv[]) { _pooled
+int main(int argc, char *argv[]) {
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
+

     _trace();
 
     UpdateExternalStatus(0);
     _trace();
 
     UpdateExternalStatus(0);


@@ -9979,12 +9983,15 @@ int main(int argc, char *argv[]) { _pooled
             NSLog(@"unknown UIUserInterfaceIdiom!");
     }
 
             NSLog(@"unknown UIUserInterfaceIdiom!");
     }
 

-    SessionData_ = [[NSMutableDictionary alloc] initWithCapacity:4];
+    SessionData_ = [NSMutableDictionary dictionaryWithCapacity:4];

 
 

-    HostConfig_ = [[NSObject alloc] init];
+    HostConfig_ = [[[NSObject alloc] init] autorelease];

     @synchronized (HostConfig_) {
         BridgedHosts_ = [NSMutableSet setWithCapacity:4];
     @synchronized (HostConfig_) {
         BridgedHosts_ = [NSMutableSet setWithCapacity:4];

+        TokenHosts_ = [NSMutableSet setWithCapacity:4];
+        InsecureHosts_ = [NSMutableSet setWithCapacity:4];

         PipelinedHosts_ = [NSMutableSet setWithCapacity:4];
         PipelinedHosts_ = [NSMutableSet setWithCapacity:4];

+        CachedURLs_ = [NSMutableSet setWithCapacity:32];

     }
 
     UI_ = CydiaURL([NSString stringWithFormat:@"ui/ios~%@", Idiom_]);
     }
 
     UI_ = CydiaURL([NSString stringWithFormat:@"ui/ios~%@", Idiom_]);


@@ -10123,11 +10130,11 @@ int main(int argc, char *argv[]) { _pooled
     else
         Machine_ = machine;
 
     else
         Machine_ = machine;
 

-    SerialNumber_ = CYIOGetValue("IOService:/", @"IOPlatformSerialNumber");
-    ChipID_ = CYHex(CYIOGetValue("IODeviceTree:/chosen", @"unique-chip-id"), true, true);
-    BBSNum_ = CYHex(CYIOGetValue("IOService:/AppleARMPE/baseband", @"snum"), false, false);
+    SerialNumber_ = (NSString *) CYIOGetValue("IOService:/", @"IOPlatformSerialNumber");
+    ChipID_ = [CYHex((NSData *) CYIOGetValue("IODeviceTree:/chosen", @"unique-chip-id"), true) uppercaseString];
+    BBSNum_ = CYHex((NSData *) CYIOGetValue("IOService:/AppleARMPE/baseband", @"snum"), false);

 
 

-    UniqueID_ = [[UIDevice currentDevice] uniqueIdentifier];
+    UniqueID_ = [device uniqueIdentifier];

 
     CFStringRef (*$CTSIMSupportCopyMobileSubscriberCountryCode)(CFAllocatorRef);
     $CTSIMSupportCopyMobileSubscriberCountryCode = reinterpret_cast<CFStringRef (*)(CFAllocatorRef)>(dlsym(RTLD_DEFAULT, "CTSIMSupportCopyMobileSubscriberCountryCode"));
 
     CFStringRef (*$CTSIMSupportCopyMobileSubscriberCountryCode)(CFAllocatorRef);
     $CTSIMSupportCopyMobileSubscriberCountryCode = reinterpret_cast<CFStringRef (*)(CFAllocatorRef)>(dlsym(RTLD_DEFAULT, "CTSIMSupportCopyMobileSubscriberCountryCode"));


@@ -10164,15 +10171,28 @@ int main(int argc, char *argv[]) { _pooled
         Settings_ = [Metadata_ objectForKey:@"Settings"];
 
         Packages_ = [Metadata_ objectForKey:@"Packages"];
         Settings_ = [Metadata_ objectForKey:@"Settings"];
 
         Packages_ = [Metadata_ objectForKey:@"Packages"];

+
+        Values_ = [Metadata_ objectForKey:@"Values"];

         Sections_ = [Metadata_ objectForKey:@"Sections"];
         Sources_ = [Metadata_ objectForKey:@"Sources"];
 
         Token_ = [Metadata_ objectForKey:@"Token"];
         Sections_ = [Metadata_ objectForKey:@"Sections"];
         Sources_ = [Metadata_ objectForKey:@"Sources"];
 
         Token_ = [Metadata_ objectForKey:@"Token"];

+
+        Version_ = [Metadata_ objectForKey:@"Version"];
+
+        @synchronized (HostConfig_) {
+            CydiaSource_ = [Metadata_ objectForKey:@"CydiaSource"];
+        }

     }
 
     if (Settings_ != nil)
         Role_ = [Settings_ objectForKey:@"Role"];
 
     }
 
     if (Settings_ != nil)
         Role_ = [Settings_ objectForKey:@"Role"];
 

+    if (Values_ == nil) {
+        Values_ = [[[NSMutableDictionary alloc] initWithCapacity:4] autorelease];
+        [Metadata_ setObject:Values_ forKey:@"Values"];
+    }
+

     if (Sections_ == nil) {
         Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
         [Metadata_ setObject:Sections_ forKey:@"Sections"];
     if (Sections_ == nil) {
         Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
         [Metadata_ setObject:Sections_ forKey:@"Sections"];


@@ -10182,8 +10202,36 @@ int main(int argc, char *argv[]) { _pooled
         Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease];
         [Metadata_ setObject:Sources_ forKey:@"Sources"];
     }
         Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease];
         [Metadata_ setObject:Sources_ forKey:@"Sources"];
     }

+
+    if (Version_ == nil) {
+        Version_ = [NSNumber numberWithUnsignedInt:0];
+        [Metadata_ setObject:Version_ forKey:@"Version"];
+    }
+
+    @synchronized (HostConfig_) {
+        if (CydiaSource_ == nil) {
+            CydiaSource_ = @"apt.saurik.com";
+            [Metadata_ setObject:CydiaSource_ forKey:@"CydiaSource"];
+        }
+    }
+
+    if ([Version_ unsignedIntValue] == 0) {
+        AddSource(@"http://apt.thebigboss.org/repofiles/cydia/", @"stable", [NSMutableArray arrayWithObject:@"main"]);
+        AddSource(@"http://apt.modmyi.com/", @"stable", [NSMutableArray arrayWithObject:@"main"]);
+        AddSource(@"http://cydia.zodttd.com/repo/cydia/", @"stable", [NSMutableArray arrayWithObject:@"main"]);
+        AddSource(@"http://repo666.ultrasn0w.com/", @"./");
+
+        Version_ = [NSNumber numberWithUnsignedInt:1];
+        [Metadata_ setObject:Version_ forKey:@"Version"];
+
+        [Metadata_ removeObjectForKey:@"LastUpdate"];
+
+        Changed_ = true;
+    }

     /* }}} */
 
     /* }}} */
 

+    WriteSources();
+

     _trace();
     MetaFile_.Open("/var/lib/cydia/metadata.cb0");
     _trace();
     _trace();
     MetaFile_.Open("/var/lib/cydia/metadata.cb0");
     _trace();


@@ -10291,5 +10339,6 @@ int main(int argc, char *argv[]) { _pooled
     CGColorSpaceRelease(space_);
     CFRelease(Locale_);
 
     CGColorSpaceRelease(space_);
     CFRelease(Locale_);
 

+    [pool release];

     return value;
 }
     return value;
 }