Figured out (a while ago, on my iPhone) why table cell diselection was broken.

[cydia.git] / Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index 06b6323e251fd160cfab102792a7b844600fac6f..129ba0ebbce0892c48e3c4be24c0cfc0bcc9f8b8 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -36,21 +36,22 @@
 */
 
 /* #include Directives {{{ */
 */
 
 /* #include Directives {{{ */

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

 #include <CoreGraphics/CoreGraphics.h>
 #include <GraphicsServices/GraphicsServices.h>
 #include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
 #include <WebCore/DOMHTML.h>
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <GraphicsServices/GraphicsServices.h>
 #include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
 #include <WebCore/DOMHTML.h>
 

-#import "RVBook.h"
-#import "RVPage.h"
+#import "BrowserView.h"
+#import "ResetView.h"
+#import "UICaboodle.h"

 
 #include <WebKit/WebFrame.h>
 #include <WebKit/WebView.h>
 
 
 #include <WebKit/WebFrame.h>
 #include <WebKit/WebView.h>
 

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

 #include <sstream>
 #include <string>
 
 #include <sstream>
 #include <string>
 


@@ -60,6 +61,7 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>

+#include <apt-pkg/clean.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>


@@ -83,26 +85,6 @@ extern "C" {
 #include <pcre.h>
 /* }}} */
 
 #include <pcre.h>
 /* }}} */
 

-/* Miscellaneous Messages {{{ */
-@interface NSString (Cydia)
-- (NSString *) stringByAddingPercentEscapes;
-- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
-@end
-/* }}} */
-/* External Constants {{{ */
-extern NSString *kUIButtonBarButtonAction;
-extern NSString *kUIButtonBarButtonInfo;
-extern NSString *kUIButtonBarButtonInfoOffset;
-extern NSString *kUIButtonBarButtonSelectedInfo;
-extern NSString *kUIButtonBarButtonStyle;
-extern NSString *kUIButtonBarButtonTag;
-extern NSString *kUIButtonBarButtonTarget;
-extern NSString *kUIButtonBarButtonTitle;
-extern NSString *kUIButtonBarButtonTitleVerticalHeight;
-extern NSString *kUIButtonBarButtonTitleWidth;
-extern NSString *kUIButtonBarButtonType;
-/* }}} */
-

 /* iPhoneOS 2.0 Compatibility {{{ */
 #ifdef __OBJC2__
 @interface UICGColor : NSObject {
 /* iPhoneOS 2.0 Compatibility {{{ */
 #ifdef __OBJC2__
 @interface UICGColor : NSObject {


@@ -153,64 +135,79 @@ extern NSString *kUIButtonBarButtonType;
 #endif
 /* }}} */
 
 #endif
 /* }}} */
 

-OBJC_EXPORT const char *class_getName(Class cls);
+#ifdef __OBJC2__
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 1,
+    kUIProgressIndicatorStyleSmallWhite = 0,
+    kUIProgressIndicatorStyleSmallBlack = 4
+} UIProgressIndicatorStyle;
+#else
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 0,
+    kUIProgressIndicatorStyleSmallWhite = 2,
+    kUIProgressIndicatorStyleSmallBlack = 3
+} UIProgressIndicatorStyle;
+#endif
+
+typedef enum {
+    kUIControlEventMouseDown = 1 << 0,
+    kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target
+    kUIControlEventMouseMovedOutside = 1 << 3, // mouse moved outside control target
+    kUIControlEventMouseUpInside = 1 << 6, // mouse up inside control target
+    kUIControlEventMouseUpOutside = 1 << 7, // mouse up outside control target
+    kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
+} UIControlEventMasks;

 
 

-/* Reset View (UIView) {{{ */
-@interface UIView (RVBook)
-- (void) resetViewAnimated:(BOOL)animated;
-- (void) clearView;
+@interface NSString (UIKit)
+- (NSString *) stringByAddingPercentEscapes;
+- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;

 @end
 
 @end
 

-@implementation UIView (RVBook)
+@interface NSString (Cydia)
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
+- (NSComparisonResult) compareByPath:(NSString *)other;
+@end

 
 

-- (void) resetViewAnimated:(BOOL)animated {
-    fprintf(stderr, "%s\n", class_getName(self->isa));
-    _assert(false);
-}
+@implementation NSString (Cydia)

 
 

-- (void) clearView {
-    fprintf(stderr, "%s\n", class_getName(self->isa));
-    _assert(false);
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
+    char data[length + 1];
+    memcpy(data, bytes, length);
+    data[length] = '\0';
+    return [NSString stringWithUTF8String:data];

 }
 
 }
 

-@end
-/* }}} */
-/* Reset View (UITable) {{{ */
-@interface UITable (RVBook)
-- (void) resetViewAnimated:(BOOL)animated;
-- (void) clearView;
-@end
-
-@implementation UITable (RVBook)
+- (NSComparisonResult) compareByPath:(NSString *)other {
+    NSString *prefix = [self commonPrefixWithString:other options:0];
+    size_t length = [prefix length];

 
 

-- (void) resetViewAnimated:(BOOL)animated {
-    [self selectRow:-1 byExtendingSelection:NO withFade:animated];
-}
+    NSRange lrange = NSMakeRange(length, [self length] - length);
+    NSRange rrange = NSMakeRange(length, [other length] - length);

 
 

-- (void) clearView {
-    [self clearAllData];
-}
+    lrange = [self rangeOfString:@"/" options:0 range:lrange];
+    rrange = [other rangeOfString:@"/" options:0 range:rrange];

 
 

-@end
-/* }}} */
-/* Reset View (UISectionList) {{{ */
-@interface UISectionList (RVBook)
-- (void) resetViewAnimated:(BOOL)animated;
-- (void) clearView;
-@end
+    NSComparisonResult value;

 
 

-@implementation UISectionList (RVBook)
+    if (lrange.location == NSNotFound && rrange.location == NSNotFound)
+        value = NSOrderedSame;
+    else if (lrange.location == NSNotFound)
+        value = NSOrderedAscending;
+    else if (rrange.location == NSNotFound)
+        value = NSOrderedDescending;
+    else
+        value = NSOrderedSame;

 
 

-- (void) resetViewAnimated:(BOOL)animated {
-    [[self table] resetViewAnimated:animated];
-}
+    NSString *lpath = lrange.location == NSNotFound ? [self substringFromIndex:length] :
+        [self substringWithRange:NSMakeRange(length, lrange.location - length)];
+    NSString *rpath = rrange.location == NSNotFound ? [other substringFromIndex:length] :
+        [other substringWithRange:NSMakeRange(length, rrange.location - length)];

 
 

-- (void) clearView {
-    [[self table] clearView];
+    NSComparisonResult result = [lpath compare:rpath];
+    return result == NSOrderedSame ? value : result;

 }
 
 @end
 }
 
 @end

-/* }}} */

 
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
 
 /* Perl-Compatible RegEx {{{ */
 class Pcre {


@@ -244,10 +241,12 @@ class Pcre {
     }
 
     NSString *operator [](size_t match) {
     }
 
     NSString *operator [](size_t match) {

-        return [NSString
-            stringWithCString:(data_ + matches_[match * 2])
-            length:(matches_[match * 2 + 1] - matches_[match * 2])
-        ];
+        return [NSString stringWithUTF8Bytes:(data_ + matches_[match * 2]) length:(matches_[match * 2 + 1] - matches_[match * 2])];
+    }
+
+    bool operator ()(NSString *data) {
+        // XXX: length is for characters, not for bytes
+        return operator ()([data UTF8String], [data length]);

     }
 
     bool operator ()(const char *data, size_t size) {
     }
 
     bool operator ()(const char *data, size_t size) {


@@ -301,7 +300,12 @@ Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
             name_ = [email_r[1] retain];
             email_ = [email_r[2] retain];
         } else {
             name_ = [email_r[1] retain];
             email_ = [email_r[2] retain];
         } else {

-            name_ = [[NSString stringWithCString:data length:size] retain];
+            name_ = [[NSString alloc]
+                initWithBytes:data
+                length:size
+                encoding:kCFStringEncodingUTF8
+            ];
+

             email_ = nil;
         }
     } return self;
             email_ = nil;
         }
     } return self;


@@ -401,7 +405,15 @@ class GSFont {
 
 /* Random Global Variables {{{ */
 static const int PulseInterval_ = 50000;
 
 /* Random Global Variables {{{ */
 static const int PulseInterval_ = 50000;

+static const int ButtonBarHeight_ = 48;
+static const float KeyboardTime_ = 0.4f;
+static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+
+#ifndef Cydia_
+#define Cydia_ ""
+#endif

 
 

+static CGColor Blueish_;

 static CGColor Black_;
 static CGColor Clear_;
 static CGColor Red_;
 static CGColor Black_;
 static CGColor Clear_;
 static CGColor Red_;


@@ -410,6 +422,10 @@ static CGColor White_;
 static NSString *Home_;
 static BOOL Sounds_Keyboard_;
 
 static NSString *Home_;
 static BOOL Sounds_Keyboard_;
 

+static BOOL Advanced_;
+static BOOL Loaded_;
+static BOOL Ignored_;
+

 const char *Firmware_ = NULL;
 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;
 const char *Firmware_ = NULL;
 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;


@@ -418,6 +434,7 @@ unsigned Major_;
 unsigned Minor_;
 unsigned BugFix_;
 
 unsigned Minor_;
 unsigned BugFix_;
 

+CFLocaleRef Locale_;

 CGColorSpaceRef space_;
 
 #define FW_LEAST(major, minor, bugfix) \
 CGColorSpaceRef space_;
 
 #define FW_LEAST(major, minor, bugfix) \


@@ -426,10 +443,11 @@ CGColorSpaceRef space_;
             bugfix <= BugFix_))
 
 bool bootstrap_;
             bugfix <= BugFix_))
 
 bool bootstrap_;

-bool restart_;
+bool reload_;

 
 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;
 
 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;

+static bool Changed_;

 static NSDate *now_;
 
 NSString *GetLastUpdate() {
 static NSDate *now_;
 
 NSString *GetLastUpdate() {


@@ -438,12 +456,10 @@ NSString *GetLastUpdate() {
     if (update == nil)
         return @"Never or Unknown";
 
     if (update == nil)
         return @"Never or Unknown";
 

-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);

     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFRelease(formatter);
     CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
 
     CFRelease(formatter);

-    CFRelease(locale);

 
     return [(NSString *) formatted autorelease];
 }
 
     return [(NSString *) formatted autorelease];
 }


@@ -465,6 +481,13 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 

+NSString *StripVersion(NSString *version) {
+    NSRange colon = [version rangeOfString:@":"];
+    if (colon.location != NSNotFound)
+        version = [version substringFromIndex:(colon.location + 1)];
+    return version;
+}
+

 static const float TextViewOffset_ = 22;
 
 UITextView *GetTextView(NSString *value, float left, bool html) {
 static const float TextViewOffset_ = 22;
 
 UITextView *GetTextView(NSString *value, float left, bool html) {


@@ -504,13 +527,32 @@ NSString *Simplify(NSString *title) {
 @class Package;
 @class Source;
 
 @class Package;
 @class Source;
 

+@interface NSObject (ProgressDelegate)
+@end
+
+@implementation NSObject(ProgressDelegate)
+
+- (void) _setProgressError:(NSArray *)args {
+    [self performSelector:@selector(setProgressError:forPackage:)
+        withObject:[args objectAtIndex:0]
+        withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
+    ];
+}
+
+@end
+

 @protocol ProgressDelegate
 @protocol ProgressDelegate

-- (void) setProgressError:(NSString *)error;
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;

 - (void) setProgressTitle:(NSString *)title;
 - (void) setProgressPercent:(float)percent;
 - (void) addProgressOutput:(NSString *)output;
 @end
 
 - (void) setProgressTitle:(NSString *)title;
 - (void) setProgressPercent:(float)percent;
 - (void) addProgressOutput:(NSString *)output;
 @end
 

+@protocol ConfigurationDelegate
+- (void) repairWithSelector:(SEL)selector;
+- (void) setConfigurationData:(NSString *)data;
+@end
+

 @protocol CydiaDelegate
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
 @protocol CydiaDelegate
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;


@@ -524,7 +566,7 @@ class Status :
     public pkgAcquireStatus
 {
   private:
     public pkgAcquireStatus
 {
   private:

-    _transient id<ProgressDelegate> delegate_;
+    _transient NSObject<ProgressDelegate> *delegate_;

 
   public:
     Status() :
 
   public:
     Status() :


@@ -544,7 +586,7 @@ class Status :
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {

-        [delegate_ setProgressTitle:[NSString stringWithCString:("Downloading " + item.ShortDesc).c_str()]];
+        [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];

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


@@ -557,7 +599,10 @@ class Status :
         )
             return;
 
         )
             return;
 

-        [delegate_ setProgressError:[NSString stringWithCString:item.Owner->ErrorText.c_str()]];
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+            waitUntilDone:YES
+        ];

     }
 
     virtual bool Pulse(pkgAcquire *Owner) {
     }
 
     virtual bool Pulse(pkgAcquire *Owner) {


@@ -588,7 +633,7 @@ class Progress :
 
   protected:
     virtual void Update() {
 
   protected:
     virtual void Update() {

-        [delegate_ setProgressTitle:[NSString stringWithCString:Op.c_str()]];
+        [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]];

         [delegate_ setProgressPercent:(Percent / 100)];
     }
 
         [delegate_ setProgressPercent:(Percent / 100)];
     }
 


@@ -611,6 +656,7 @@ class Progress :
 /* Database Interface {{{ */
 @interface Database : NSObject {
     pkgCacheFile cache_;
 /* Database Interface {{{ */
 @interface Database : NSObject {
     pkgCacheFile cache_;

+    pkgDepCache::Policy *policy_;

     pkgRecords *records_;
     pkgProblemResolver *resolver_;
     pkgAcquire *fetcher_;
     pkgRecords *records_;
     pkgProblemResolver *resolver_;
     pkgAcquire *fetcher_;


@@ -621,25 +667,33 @@ class Progress :
     NSMutableDictionary *sources_;
     NSMutableArray *packages_;
 
     NSMutableDictionary *sources_;
     NSMutableArray *packages_;
 

-    _transient id delegate_;
+    _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;

     Status status_;
     Progress progress_;
     Status status_;
     Progress progress_;

+
+    int cydiafd_;

     int statusfd_;
     int statusfd_;

+    FILE *input_;

 }
 
 }
 

+- (void) _readCydia:(NSNumber *)fd;

 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
 
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
 

+- (FILE *) input;
+

 - (Package *) packageWithName:(NSString *)name;
 
 - (Database *) init;
 - (pkgCacheFile &) cache;
 - (Package *) packageWithName:(NSString *)name;
 
 - (Database *) init;
 - (pkgCacheFile &) cache;

+- (pkgDepCache::Policy *) policy;

 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;
 - (NSArray *) packages;
 - (void) reloadData;
 
 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;
 - (NSArray *) packages;
 - (void) reloadData;
 

+- (void) configure;

 - (void) prepare;
 - (void) perform;
 - (void) upgrade;
 - (void) prepare;
 - (void) perform;
 - (void) upgrade;


@@ -709,9 +763,9 @@ class Progress :
     if ((self = [super init]) != nil) {
         trusted_ = index->IsTrusted();
 
     if ((self = [super init]) != nil) {
         trusted_ = index->IsTrusted();
 

-        uri_ = [[NSString stringWithCString:index->GetURI().c_str()] retain];
-        distribution_ = [[NSString stringWithCString:index->GetDist().c_str()] retain];
-        type_ = [[NSString stringWithCString:index->GetType()] retain];
+        uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
+        distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
+        type_ = [[NSString stringWithUTF8String:index->GetType()] retain];

 
         description_ = nil;
         label_ = nil;
 
         description_ = nil;
         label_ = nil;


@@ -734,15 +788,15 @@ class Progress :
                     value = value.substr(1);
 
                 if (name == "Default-Icon")
                     value = value.substr(1);
 
                 if (name == "Default-Icon")

-                    defaultIcon_ = [[NSString stringWithCString:value.c_str()] retain];
+                    defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain];

                 else if (name == "Description")
                 else if (name == "Description")

-                    description_ = [[NSString stringWithCString:value.c_str()] retain];
+                    description_ = [[NSString stringWithUTF8String:value.c_str()] retain];

                 else if (name == "Label")
                 else if (name == "Label")

-                    label_ = [[NSString stringWithCString:value.c_str()] retain];
+                    label_ = [[NSString stringWithUTF8String:value.c_str()] retain];

                 else if (name == "Origin")
                 else if (name == "Origin")

-                    origin_ = [[NSString stringWithCString:value.c_str()] retain];
+                    origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];

                 else if (name == "Version")
                 else if (name == "Version")

-                    version_ = [[NSString stringWithCString:value.c_str()] retain];
+                    version_ = [[NSString stringWithUTF8String:value.c_str()] retain];

             }
         }
     } return self;
             }
         }
     } return self;


@@ -784,6 +838,41 @@ class Progress :
     return defaultIcon_;
 }
 
     return defaultIcon_;
 }
 

+@end
+/* }}} */
+/* Relationship Class {{{ */
+@interface Relationship : NSObject {
+    NSString *type_;
+    NSString *id_;
+}
+
+- (NSString *) type;
+- (NSString *) id;
+- (NSString *) name;
+
+@end
+
+@implementation Relationship
+
+- (void) dealloc {
+    [type_ release];
+    [id_ release];
+    [super dealloc];
+}
+
+- (NSString *) type {
+    return type_;
+}
+
+- (NSString *) id {
+    return id_;
+}
+
+- (NSString *) name {
+    _assert(false);
+    return nil;
+}
+

 @end
 /* }}} */
 /* Package Class {{{ */
 @end
 /* }}} */
 /* Package Class {{{ */


@@ -805,7 +894,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             const char *line = std::find(value, end, '\n');
             while (line != value && line[-1] == ' ')
                 --line;
             const char *line = std::find(value, end, '\n');
             while (line != value && line[-1] == ' ')
                 --line;

-            return [NSString stringWithCString:value length:(line - value)];
+
+            return [NSString stringWithUTF8Bytes:value length:(line - value)];

         } else {
             begin = std::find(begin, end, '\n');
             if (begin == end)
         } else {
             begin = std::find(begin, end, '\n');
             if (begin == end)


@@ -820,7 +910,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     _transient Database *database_;
     pkgCache::VerIterator version_;
     pkgCache::VerFileIterator file_;
     _transient Database *database_;
     pkgCache::VerIterator version_;
     pkgCache::VerFileIterator file_;

+

     Source *source_;
     Source *source_;

+    bool cached_;

 
     NSString *latest_;
     NSString *installed_;
 
     NSString *latest_;
     NSString *installed_;


@@ -830,11 +922,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     NSString *tagline_;
     NSString *icon_;
     NSString *website_;
     NSString *tagline_;
     NSString *icon_;
     NSString *website_;

+    Address *sponsor_;
+    Address *author_;
+
+    NSArray *relationships_;

 }
 
 }
 

-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file;
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;

 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
 
 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
 

+- (pkgCache::PkgIterator) iterator;
+

 - (NSString *) section;
 - (Address *) maintainer;
 - (size_t) size;
 - (NSString *) section;
 - (Address *) maintainer;
 - (size_t) size;


@@ -845,15 +943,26 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (NSString *) latest;
 - (NSString *) installed;
 
 - (NSString *) latest;
 - (NSString *) installed;

-- (BOOL) upgradable;
+
+- (BOOL) valid;
+- (BOOL) upgradableAndEssential:(BOOL)essential;

 - (BOOL) essential;
 - (BOOL) broken;
 
 - (BOOL) essential;
 - (BOOL) broken;
 

+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;
+

 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;
 - (NSString *) icon;
 - (NSString *) website;
 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;
 - (NSString *) icon;
 - (NSString *) website;

+- (Address *) author;
+
+- (NSArray *) relationships;

 
 - (Source *) source;
 
 
 - (Source *) source;
 


@@ -876,6 +985,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 @implementation Package
 
 - (void) dealloc {
 @implementation Package
 
 - (void) dealloc {

+    if (source_ != nil)
+        [source_ release];
+

     [latest_ release];
     if (installed_ != nil)
         [installed_ release];
     [latest_ release];
     if (installed_ != nil)
         [installed_ release];


@@ -888,41 +1000,62 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [icon_ release];
     if (website_ != nil)
         [website_ release];
         [icon_ release];
     if (website_ != nil)
         [website_ release];

+    if (sponsor_ != nil)
+        [sponsor_ release];
+    if (author_ != nil)
+        [author_ release];

 
 

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

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

-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {

     if ((self = [super init]) != nil) {
         iterator_ = iterator;
         database_ = database;
 
     if ((self = [super init]) != nil) {
         iterator_ = iterator;
         database_ = database;
 

-        version_ = version;
-        file_ = file;
-
-        pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+        version_ = [database_ policy]->GetCandidateVer(iterator_);
+        latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];

 
 

-        const char *begin, *end;
-        parser->GetRec(begin, end);
-
-        latest_ = [[NSString stringWithCString:version_.VerStr()] retain];
-        installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithCString:iterator_.CurrentVer().VerStr()] retain];
-
-        id_ = [[[NSString stringWithCString:iterator_.Name()] lowercaseString] retain];
-        name_ = Scour("Name", begin, end);
-        if (name_ != nil)
-            name_ = [name_ retain];
-        tagline_ = [[NSString stringWithCString:parser->ShortDesc().c_str()] retain];
-        icon_ = Scour("Icon", begin, end);
-        if (icon_ != nil)
-            icon_ = [icon_ retain];
-        website_ = Scour("Website", begin, end);
-        if (website_ != nil)
-            website_ = [website_ retain];
+        if (!version_.end())
+            file_ = version_.FileList();
+        else {
+            pkgCache &cache([database_ cache]);
+            file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+        }

 
 

-        source_ = [[database_ getSource:file_.File()] retain];
+        pkgCache::VerIterator current = iterator_.CurrentVer();
+        installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
+
+        id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
+
+        if (!file_.end()) {
+            pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+
+            const char *begin, *end;
+            parser->GetRec(begin, end);
+
+            name_ = Scour("Name", begin, end);
+            if (name_ != nil)
+                name_ = [name_ retain];
+            tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain];
+            icon_ = Scour("Icon", begin, end);
+            if (icon_ != nil)
+                icon_ = [icon_ retain];
+            website_ = Scour("Homepage", begin, end);
+            if (website_ == nil)
+                website_ = Scour("Website", begin, end);
+            if (website_ != nil)
+                website_ = [website_ retain];
+            NSString *sponsor = Scour("Sponsor", begin, end);
+            if (sponsor != nil)
+                sponsor_ = [[Address addressWithString:sponsor] retain];
+            NSString *author = Scour("Author", begin, end);
+            if (author != nil)
+                author_ = [[Address addressWithString:author] retain];
+        }

 
         NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
         if (metadata == nil || [metadata count] == 0) {
 
         NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
         if (metadata == nil || [metadata count] == 0) {


@@ -931,39 +1064,43 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             nil];
 
             [Packages_ setObject:metadata forKey:id_];
             nil];
 
             [Packages_ setObject:metadata forKey:id_];

+            Changed_ = true;

         }
     } return self;
 }
 
 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
         }
     } return self;
 }
 
 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {

-    for (pkgCache::VerIterator version = iterator.VersionList(); !version.end(); ++version)
-        for (pkgCache::VerFileIterator file = version.FileList(); !file.end(); ++file)
-            return [[[Package alloc]
-                initWithIterator:iterator 
-                database:database
-                version:version
-                file:file]
-            autorelease];
-    return nil;
+    return [[[Package alloc]
+        initWithIterator:iterator 
+        database:database
+    ] autorelease];
+}
+
+- (pkgCache::PkgIterator) iterator {
+    return iterator_;

 }
 
 - (NSString *) section {
     const char *section = iterator_.Section();
 }
 
 - (NSString *) section {
     const char *section = iterator_.Section();

-    return section == NULL ? nil : [[NSString stringWithCString:section] stringByReplacingCharacter:'_' withCharacter:' '];
+    return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' '];

 }
 
 - (Address *) maintainer {
 }
 
 - (Address *) maintainer {

+    if (file_.end())
+        return nil;

     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);

-    return [Address addressWithString:[NSString stringWithCString:parser->Maintainer().c_str()]];
+    return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];

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

-    return version_->InstalledSize;
+    return version_.end() ? 0 : version_->InstalledSize;

 }
 
 - (NSString *) description {
 }
 
 - (NSString *) description {

+    if (file_.end())
+        return nil;

     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);

-    NSString *description([NSString stringWithCString:parser->LongDesc().c_str()]);
+    NSString *description([NSString stringWithUTF8String:parser->LongDesc().c_str()]);

 
     NSArray *lines = [description componentsSeparatedByString:@"\n"];
     NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
 
     NSArray *lines = [description componentsSeparatedByString:@"\n"];
     NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];


@@ -996,11 +1133,19 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return installed_;
 }
 
     return installed_;
 }
 

-- (BOOL) upgradable {
-    if (NSString *installed = [self installed])
-        return [[self latest] compare:installed] != NSOrderedSame ? YES : NO;
-    else
-        return [self essential];
+- (BOOL) valid {
+    return !version_.end();
+}
+
+- (BOOL) upgradableAndEssential:(BOOL)essential {
+    pkgCache::VerIterator current = iterator_.CurrentVer();
+
+    if (current.end())
+        return essential && [self essential];
+    else {
+        pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
+        return !candidate.end() && candidate != current;
+    }

 }
 
 - (BOOL) essential {
 }
 
 - (BOOL) essential {


@@ -1008,7 +1153,61 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (BOOL) broken {
 }
 
 - (BOOL) broken {

-    return (*[database_ cache])[iterator_].InstBroken();
+    return [database_ cache][iterator_].InstBroken();
+}
+
+- (BOOL) half {
+    unsigned char current = iterator_->CurrentState;
+    return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) halfConfigured {
+    return iterator_->CurrentState == pkgCache::State::HalfConfigured;
+}
+
+- (BOOL) halfInstalled {
+    return iterator_->CurrentState == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) hasMode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+    return state.Mode != pkgDepCache::ModeKeep;
+}
+
+- (NSString *) mode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+
+    switch (state.Mode) {
+        case pkgDepCache::ModeDelete:
+            if ((state.iFlags & pkgDepCache::Purge) != 0)
+                return @"Purge";
+            else
+                return @"Remove";
+            _assert(false);
+        case pkgDepCache::ModeKeep:
+            if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+                return nil;
+            else
+                return nil;
+            _assert(false);
+        case pkgDepCache::ModeInstall:
+            if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+                return @"Reinstall";
+            else switch (state.Status) {
+                case -1:
+                    return @"Downgrade";
+                case 0:
+                    return @"Install";
+                case 1:
+                    return @"Upgrade";
+                case 2:
+                    return @"New Install";
+                default:
+                    _assert(false);
+            }
+        default:
+            _assert(false);
+    }

 }
 
 - (NSString *) id {
 }
 
 - (NSString *) id {


@@ -1031,7 +1230,24 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return website_;
 }
 
     return website_;
 }
 

+- (Address *) sponsor {
+    return sponsor_;
+}
+
+- (Address *) author {
+    return author_;
+}
+
+- (NSArray *) relationships {
+    return relationships_;
+}
+

 - (Source *) source {
 - (Source *) source {

+    if (!cached_) {
+        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
+        cached_ = true;
+    }
+

     return source_;
 }
 
     return source_;
 }
 


@@ -1108,8 +1324,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (NSComparisonResult) compareForChanges:(Package *)package {
 }
 
 - (NSComparisonResult) compareForChanges:(Package *)package {

-    BOOL lhs = [self upgradable];
-    BOOL rhs = [package upgradable];
+    BOOL lhs = [self upgradableAndEssential:YES];
+    BOOL rhs = [package upgradableAndEssential:YES];

 
     if (lhs != rhs)
         return lhs ? NSOrderedAscending : NSOrderedDescending;
 
     if (lhs != rhs)
         return lhs ? NSOrderedAscending : NSOrderedDescending;


@@ -1149,15 +1365,21 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (NSNumber *) isSearchedForBy:(NSString *)search {
 }
 
 - (NSNumber *) isSearchedForBy:(NSString *)search {

-    return [NSNumber numberWithBool:[self matches:search]];
+    return [NSNumber numberWithBool:([self valid] && [self matches:search])];

 }
 
 - (NSNumber *) isInstalledInSection:(NSString *)section {
     return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))];
 }
 
 }
 
 - (NSNumber *) isInstalledInSection:(NSString *)section {
     return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))];
 }
 

-- (NSNumber *) isUninstalledInSection:(NSString *)section {
-    return [NSNumber numberWithBool:([self installed] == nil && (section == nil || [section isEqualToString:[self section]]))];
+- (NSNumber *) isUninstalledInSection:(NSString *)name {
+    NSString *section = [self section];
+
+    return [NSNumber numberWithBool:([self valid] && [self installed] == nil && (
+        (name == nil ||
+        section == nil && [name length] == 0 ||
+        [name isEqualToString:section])
+    ))];

 }
 
 @end
 }
 
 @end


@@ -1218,42 +1440,63 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 

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

     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
     std::istream is(&ib);
     std::string line;
 

-    const char *error;
-    int offset;
-    pcre *code = pcre_compile("^([^:]*):([^:]*):([^:]*):(.*)$", 0, &error, &offset, NULL);
-
-    pcre_extra *study = NULL;
-    int capture;
-    pcre_fullinfo(code, study, PCRE_INFO_CAPTURECOUNT, &capture);
-    int matches[(capture + 1) * 3];
-

     while (std::getline(is, line)) {
         const char *data(line.c_str());
     while (std::getline(is, line)) {
         const char *data(line.c_str());

+        //size_t size = line.size();
+        fprintf(stderr, "C:%s\n", data);
+    }
+
+    [pool release];
+    _assert(false);
+}

 
 

-        _assert(pcre_exec(code, study, data, line.size(), 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0);
+- (void) _readStatus:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;

 
 

-        std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
-        float percent;
-        buffer >> percent;
-        [delegate_ setProgressPercent:(percent / 100)];
+    Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+    Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");

 
 

-        NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
-        std::string type(line.substr(matches[2], matches[3] - matches[2]));
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        size_t size = line.size();
+        fprintf(stderr, "S:%s\n", data);

 
 

-        if (type == "pmerror")
-            [delegate_ setProgressError:string];
-        else if (type == "pmstatus")
+        if (conffile_r(data, size)) {
+            [delegate_ setConfigurationData:conffile_r[1]];
+        } else if (strncmp(data, "status: ", 8) == 0) {
+            NSString *string = [NSString stringWithUTF8String:(data + 8)];

             [delegate_ setProgressTitle:string];
             [delegate_ setProgressTitle:string];

-        else if (type == "pmconffile")
-            ;
-        else _assert(false);
+        } else if (pmstatus_r(data, size)) {
+            std::string type([pmstatus_r[1] UTF8String]);
+            NSString *id = pmstatus_r[2];
+
+            float percent([pmstatus_r[3] floatValue]);
+            [delegate_ setProgressPercent:(percent / 100)];
+
+            NSString *string = pmstatus_r[4];
+
+            if (type == "pmerror")
+                [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+                    withObject:[NSArray arrayWithObjects:string, id, nil]
+                    waitUntilDone:YES
+                ];
+            else if (type == "pmstatus")
+                [delegate_ setProgressTitle:string];
+            else if (type == "pmconffile")
+                [delegate_ setConfigurationData:string];
+            else _assert(false);
+        } else _assert(false);

     }
 
     [pool release];
     }
 
     [pool release];


@@ -1267,20 +1510,29 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     std::istream is(&ib);
     std::string line;
 
     std::istream is(&ib);
     std::string line;
 

-    while (std::getline(is, line))
-        [delegate_ addProgressOutput:[NSString stringWithCString:line.c_str()]];
+    while (std::getline(is, line)) {
+        fprintf(stderr, "O:%s\n", line.c_str());
+        [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
+    }

 
     [pool release];
     _assert(false);
 }
 
 
     [pool release];
     _assert(false);
 }
 

+- (FILE *) input {
+    return input_;
+}
+

 - (Package *) packageWithName:(NSString *)name {
 - (Package *) packageWithName:(NSString *)name {

+    if (static_cast<pkgDepCache *>(cache_) == NULL)
+        return nil;

     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
     return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
 }
 
 - (Database *) init {
     if ((self = [super init]) != nil) {
     pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
     return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
 }
 
 - (Database *) init {
     if ((self = [super init]) != nil) {

+        policy_ = NULL;

         records_ = NULL;
         resolver_ = NULL;
         fetcher_ = NULL;
         records_ = NULL;
         resolver_ = NULL;
         fetcher_ = NULL;


@@ -1291,6 +1543,18 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
         int fds[2];
 
 
         int fds[2];
 

+        _assert(pipe(fds) != -1);
+        cydiafd_ = fds[1];
+
+        _config->Set("APT::Keep-Fds::", cydiafd_);
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readCydia:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+

         _assert(pipe(fds) != -1);
         statusfd_ = fds[1];
 
         _assert(pipe(fds) != -1);
         statusfd_ = fds[1];
 


@@ -1300,6 +1564,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             withObject:[[NSNumber numberWithInt:fds[0]] retain]
         ];
 
             withObject:[[NSNumber numberWithInt:fds[0]] retain]
         ];
 

+        _assert(pipe(fds) != -1);
+        _assert(dup2(fds[0], 0) != -1);
+        _assert(close(fds[0]) != -1);
+
+        input_ = fdopen(fds[1], "a");
+

         _assert(pipe(fds) != -1);
         _assert(dup2(fds[1], 1) != -1);
         _assert(close(fds[1]) != -1);
         _assert(pipe(fds) != -1);
         _assert(dup2(fds[1], 1) != -1);
         _assert(close(fds[1]) != -1);


@@ -1316,6 +1586,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return cache_;
 }
 
     return cache_;
 }
 

+- (pkgDepCache::Policy *) policy {
+    return policy_;
+}
+

 - (pkgRecords *) records {
     return records_;
 }
 - (pkgRecords *) records {
     return records_;
 }


@@ -1334,23 +1608,45 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) reloadData {
     _error->Discard();
 
 - (void) reloadData {
     _error->Discard();

+

     delete list_;
     delete list_;

+    list_ = NULL;

     manager_ = NULL;
     delete lock_;
     manager_ = NULL;
     delete lock_;

+    lock_ = NULL;

     delete fetcher_;
     delete fetcher_;

+    fetcher_ = NULL;

     delete resolver_;
     delete resolver_;

+    resolver_ = NULL;

     delete records_;
     delete records_;

+    records_ = NULL;
+    delete policy_;
+    policy_ = NULL;
+

     cache_.Close();
 
     if (!cache_.Open(progress_, true)) {
     cache_.Close();
 
     if (!cache_.Open(progress_, true)) {

-        fprintf(stderr, "repairing corrupted database...\n");
+        std::string error;
+        if (!_error->PopMessage(error))
+            _assert(false);

         _error->Discard();
         _error->Discard();

-        [self updateWithStatus:status_];
-        _assert(cache_.Open(progress_, true));
+        fprintf(stderr, "cache_.Open():[%s]\n", error.c_str());
+
+        if (error == "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. ")
+            [delegate_ repairWithSelector:@selector(configure)];
+        else if (error == "The package lists or status file could not be parsed or opened.")
+            [delegate_ repairWithSelector:@selector(update)];
+        // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
+        // else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
+        // else if (error == "The list of sources could not be read.")
+        else _assert(false);
+
+        return;

     }
 
     now_ = [[NSDate date] retain];
 
     }
 
     now_ = [[NSDate date] retain];
 

+    policy_ = new pkgDepCache::Policy();

     records_ = new pkgRecords(cache_);
     resolver_ = new pkgProblemResolver(cache_);
     fetcher_ = new pkgAcquire(&status_);
     records_ = new pkgRecords(cache_);
     resolver_ = new pkgProblemResolver(cache_);
     fetcher_ = new pkgAcquire(&status_);


@@ -1359,6 +1655,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     list_ = new pkgSourceList();
     _assert(list_->ReadMainList());
 
     list_ = new pkgSourceList();
     _assert(list_->ReadMainList());
 

+    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
+    _assert(pkgApplyStatus(cache_));
+
+    if (cache_->BrokenCount() != 0) {
+        _assert(pkgFixBroken(cache_));
+        _assert(cache_->BrokenCount() == 0);
+        _assert(pkgMinimizeUpgrade(cache_));
+    }
+

     [sources_ removeAllObjects];
     for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
         std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
     [sources_ removeAllObjects];
     for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
         std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();


@@ -1372,8 +1677,41 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [packages_ removeAllObjects];
     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
         if (Package *package = [Package packageWithIterator:iterator database:self])
     [packages_ removeAllObjects];
     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
         if (Package *package = [Package packageWithIterator:iterator database:self])

-            if ([package source] != nil || [package installed] != nil)
-                [packages_ addObject:package];
+            [packages_ addObject:package];
+
+    [packages_ sortUsingSelector:@selector(compareByName:)];
+}
+
+- (void) configure {
+    NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
+    system([dpkg UTF8String]);
+}
+
+- (void) clean {
+    if (lock_ != NULL)
+        return;
+
+    FileFd Lock;
+    Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    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;
+
+    if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
+        std::string error;
+        while (_error->PopMessage(error))
+            fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+    }

 }
 
 - (void) prepare {
 }
 
 - (void) prepare {


@@ -1425,15 +1763,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (void) upgrade {
 }
 
 - (void) upgrade {

-    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
-    _assert(pkgApplyStatus(cache_));
-
-    if (cache_->BrokenCount() != 0) {
-        _assert(pkgFixBroken(cache_));
-        _assert(cache_->BrokenCount() == 0);
-        _assert(pkgMinimizeUpgrade(cache_));
-    }
-

     _assert(pkgDistUpgrade(cache_));
 }
 
     _assert(pkgDistUpgrade(cache_));
 }
 


@@ -1466,6 +1795,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         }
 
         [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
         }
 
         [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];

+        Changed_ = true;

     }
 }
 
     }
 }
 


@@ -1561,8 +1891,23 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {

-    [essential_ dismiss];
-    [self cancel];
+    NSString *context = [sheet context];
+
+    if ([context isEqualToString:@"remove"])
+        switch (button) {
+            case 1:
+                [self cancel];
+                break;
+            case 2:
+                [delegate_ confirm];
+                break;
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"unable"])
+        [self cancel];
+
+    [sheet dismiss];

 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {


@@ -1654,7 +1999,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         CGRect bounds = [overlay_ bounds];
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
         CGRect bounds = [overlay_ bounds];
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];

-        [navbar_ setBarStyle:1];
+        if (Advanced_)
+            [navbar_ setBarStyle:1];

         [navbar_ setDelegate:self];
 
         UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
         [navbar_ setDelegate:self];
 
         UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];


@@ -1672,12 +2018,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         bool remove(false);
 
         pkgCacheFile &cache([database_ cache]);
         bool remove(false);
 
         pkgCacheFile &cache([database_ cache]);

-        for (pkgCache::PkgIterator iterator = cache->PkgBegin(); !iterator.end(); ++iterator) {
-            Package *package([Package packageWithIterator:iterator database:database_]);
-            NSString *name([package name]);
-            bool essential((iterator->Flags & pkgCache::Flag::Essential) != 0);
+        NSArray *packages = [database_ packages];
+        for (size_t i(0), e = [packages count]; i != e; ++i) {
+            Package *package = [packages objectAtIndex:i];
+            pkgCache::PkgIterator iterator = [package iterator];

             pkgDepCache::StateCache &state(cache[iterator]);
 
             pkgDepCache::StateCache &state(cache[iterator]);
 

+            NSString *name([package name]);
+

             if (state.NewInstall())
                 [installing addObject:name];
             else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)
             if (state.NewInstall())
                 [installing addObject:name];
             else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)


@@ -1687,7 +2035,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             else if (state.Downgrade())
                 [downgrading addObject:name];
             else if (state.Delete()) {
             else if (state.Downgrade())
                 [downgrading addObject:name];
             else if (state.Delete()) {

-                if (essential)
+                if ([package essential])

                     remove = true;
                 [removing addObject:name];
             }
                     remove = true;
                 [removing addObject:name];
             }


@@ -1695,16 +2043,32 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         if (!remove)
             essential_ = nil;
 
         if (!remove)
             essential_ = nil;

-        else {
+        else if (Advanced_ || true) {
+            essential_ = [[UIAlertSheet alloc]
+                initWithTitle:@"Removing Essentials"
+                buttons:[NSArray arrayWithObjects:
+                    @"Cancel Operation (Safe)",
+                    @"Force Removal (Unsafe)",
+                nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"remove"
+            ];
+
+#ifndef __OBJC2__
+            [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+#endif
+            [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
+        } else {

             essential_ = [[UIAlertSheet alloc]
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
                 delegate:self
             essential_ = [[UIAlertSheet alloc]
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
                 delegate:self

-                context:self
+                context:@"unable"

             ];
 
             ];
 

-            [essential_ setBodyText:@"One or more of the packages you are about to remove are marked 'Essential' and cannot be removed by Cydia. Please use apt-get."];
+            [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."];

         }
 
         AddTextView(fields_, installing, @"Installing");
         }
 
         AddTextView(fields_, installing, @"Installing");


@@ -1776,9 +2140,13 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @end
 /* }}} */
 /* Progress View {{{ */
 @end
 /* }}} */
 /* Progress View {{{ */

+Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+

 @interface ProgressView : UIView <
 @interface ProgressView : UIView <

+    ConfigurationDelegate,

     ProgressDelegate
 > {
     ProgressDelegate
 > {

+    _transient Database *database_;

     UIView *view_;
     UIView *background_;
     UITransitionView *transition_;
     UIView *view_;
     UIView *background_;
     UITransitionView *transition_;


@@ -1787,12 +2155,13 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UIProgressBar *progress_;
     UITextView *output_;
     UITextLabel *status_;
     UIProgressBar *progress_;
     UITextView *output_;
     UITextLabel *status_;

+    UIPushButton *close_;

     id delegate_;
 }
 
 - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
 
     id delegate_;
 }
 
 - (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
 

-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate;

 - (void) setContentView:(UIView *)view;
 - (void) resetView;
 
 - (void) setContentView:(UIView *)view;
 - (void) resetView;
 


@@ -1821,6 +2190,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [progress_ release];
     [output_ release];
     [status_ release];
     [progress_ release];
     [output_ release];
     [status_ release];

+    [close_ release];

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


@@ -1829,8 +2199,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         exit(0);
 }
 
         exit(0);
 }
 

-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate {

     if ((self = [super initWithFrame:frame]) != nil) {
     if ((self = [super initWithFrame:frame]) != nil) {

+        database_ = database;

         delegate_ = delegate;
 
         transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
         delegate_ = delegate;
 
         transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];


@@ -1869,7 +2240,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         }, prgsize};
 
         progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
         }, prgsize};
 
         progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];

-        [overlay_ addSubview:progress_];
+        [progress_ setStyle:0];

 
         status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
             10,
 
         status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
             10,


@@ -1899,11 +2270,30 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         [output_ setMarginTop:0];
         [output_ setAllowsRubberBanding:YES];
 
         [output_ setMarginTop:0];
         [output_ setAllowsRubberBanding:YES];

+        [output_ setEditable:NO];

 
         [overlay_ addSubview:output_];
 
         [overlay_ addSubview:output_];

-        [overlay_ addSubview:status_];

 
 

-        [progress_ setStyle:0];
+        close_ = [[UIPushButton alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            32 + prgsize.height
+        )];
+
+        [close_ setAutosizesToFit:NO];
+        [close_ setDrawsShadow:YES];
+        [close_ setStretchBackground:YES];
+        [close_ setTitle:@"Close Window"];
+        [close_ setEnabled:YES];
+
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        [close_ setTitleFont:bold];
+        CFRelease(bold);
+
+        [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1];

     } return self;
 }
 
     } return self;
 }
 


@@ -1916,14 +2306,41 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {

+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"conffile"]) {
+        FILE *input = [database_ input];
+
+        switch (button) {
+            case 1:
+                fprintf(input, "N\n");
+                fflush(input);
+                break;
+            case 2:
+                fprintf(input, "Y\n");
+                fflush(input);
+                break;
+            default:
+                _assert(false);
+        }
+    }
+

     [sheet dismiss];
 }
 
     [sheet dismiss];
 }
 

-- (void) _retachThread {
+- (void) closeButtonPushed {

     [delegate_ progressViewIsComplete:self];
     [self resetView];
 }
 
     [delegate_ progressViewIsComplete:self];
     [self resetView];
 }
 

+- (void) _retachThread {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:@"Complete"];
+
+    [overlay_ addSubview:close_];
+    [progress_ removeFromSuperview];
+    [status_ removeFromSuperview];
+}
+

 - (void) _detachNewThreadData:(ProgressData *)data {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
 - (void) _detachNewThreadData:(ProgressData *)data {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 


@@ -1936,14 +2353,17 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
 }
 
 - (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {

-    [navbar_ popNavigationItem];
-    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:title] autorelease];
-    [navbar_ pushNavigationItem:navitem];
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:title];

 
     [status_ setText:nil];
     [output_ setText:@""];
     [progress_ setProgress:0];
 
 
     [status_ setText:nil];
     [output_ setText:@""];
     [progress_ setProgress:0];
 

+    [close_ removeFromSuperview];
+    [overlay_ addSubview:progress_];
+    [overlay_ addSubview:status_];
+

     [transition_ transition:6 toView:overlay_];
 
     [NSThread
     [transition_ transition:6 toView:overlay_];
 
     [NSThread


@@ -1957,14 +2377,38 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ];
 }
 
     ];
 }
 

-- (void) setProgressError:(NSString *)error {
+- (void) repairWithSelector:(SEL)selector {
+    [self
+        detachNewThreadSelector:selector
+        toTarget:database_
+        withObject:nil
+        title:@"Repairing..."
+    ];
+}
+
+- (void) setConfigurationData:(NSString *)data {

     [self
     [self

-        performSelectorOnMainThread:@selector(_setProgressError:)
-        withObject:error
+        performSelectorOnMainThread:@selector(_setConfigurationData:)
+        withObject:data

         waitUntilDone:YES
     ];
 }
 
         waitUntilDone:YES
     ];
 }
 

+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    Package *package = id == nil ? nil : [database_ packageWithName:id];
+
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:(package == nil ? @"Source Error" : [package name])
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"error"
+    ] autorelease];
+
+    [sheet setBodyText:error];
+    [sheet popupAlertAnimated:YES];
+}
+

 - (void) setProgressTitle:(NSString *)title {
     [self
         performSelectorOnMainThread:@selector(_setProgressTitle:)
 - (void) setProgressTitle:(NSString *)title {
     [self
         performSelectorOnMainThread:@selector(_setProgressTitle:)


@@ -1989,16 +2433,28 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ];
 }
 
     ];
 }
 

-- (void) _setProgressError:(NSString *)error {
+- (void) _setConfigurationData:(NSString *)data {
+    _assert(conffile_r(data));
+
+    NSString *ofile = conffile_r[1];
+    //NSString *nfile = conffile_r[2];
+

     UIAlertSheet *sheet = [[[UIAlertSheet alloc]
     UIAlertSheet *sheet = [[[UIAlertSheet alloc]

-        initWithTitle:@"Package Error"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        initWithTitle:@"Configuration Upgrade"
+        buttons:[NSArray arrayWithObjects:
+            @"Keep My Old Copy",
+            @"Accept The New Copy",
+            // XXX: @"See What Changed",
+        nil]

         defaultButtonIndex:0
         delegate:self
         defaultButtonIndex:0
         delegate:self

-        context:self
+        context:@"conffile"

     ] autorelease];
 
     ] autorelease];
 

-    [sheet setBodyText:error];
+    [sheet setBodyText:[NSString stringWithFormat:
+        @"The following file has been changed by both the package maintainer and by you (or for you by a script).\n\n%@"
+    , ofile]];
+

     [sheet popupAlertAnimated:YES];
 }
 
     [sheet popupAlertAnimated:YES];
 }
 


@@ -2026,7 +2482,12 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UITextLabel *name_;
     UITextLabel *description_;
     UITextLabel *source_;
     UITextLabel *name_;
     UITextLabel *description_;
     UITextLabel *source_;

-    UIImageView *trusted_;
+    //UIImageView *trusted_;
+#ifdef USE_BADGES
+    UIImageView *badge_;
+    UITextLabel *status_;
+#endif
+    BOOL setup_;

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


@@ -2037,6 +2498,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
 - (void) _setSelectionFadeFraction:(float)fraction;
 
 - (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
 - (void) _setSelectionFadeFraction:(float)fraction;
 

++ (int) heightForPackage:(Package *)package;
+

 @end
 
 @implementation PackageCell
 @end
 
 @implementation PackageCell


@@ -2046,7 +2509,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [name_ release];
     [description_ release];
     [source_ release];
     [name_ release];
     [description_ release];
     [source_ release];

-    [trusted_ release];
+#ifdef USE_BADGES
+    [badge_ release];
+    [status_ release];
+#endif
+    //[trusted_ release];

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


@@ -2070,8 +2537,20 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [description_ setBackgroundColor:Clear_];
         [description_ setFont:small];
 
         [description_ setBackgroundColor:Clear_];
         [description_ setFont:small];
 

-        trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
-        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];
+        /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
+        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
+
+#ifdef USE_BADGES
+        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
+
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+        [status_ setBackgroundColor:Clear_];
+        [status_ setFont:small];
+#endif
+
+        /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]];
+        [icon_ zoomToScale:0.5];
+        [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/

 
         [self addSubview:icon_];
         [self addSubview:name_];
 
         [self addSubview:icon_];
         [self addSubview:name_];


@@ -2085,6 +2564,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) setPackage:(Package *)package {
 }
 
 - (void) setPackage:(Package *)package {

+    /*if (setup_)
+        return;
+    else
+        setup_ = YES;*/
+

     Source *source = [package source];
 
     UIImage *image = nil;
     Source *source = [package source];
 
     UIImage *image = nil;


@@ -2096,37 +2580,62 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         image = [UIImage applicationImageNamed:@"unknown.png"];
     [icon_ setImage:image];
 
         image = [UIImage applicationImageNamed:@"unknown.png"];
     [icon_ setImage:image];
 

-    if (image != nil) {
+    /*if (image != nil) {

         CGSize size = [image size];
         float scale = 30 / std::max(size.width, size.height);
         [icon_ zoomToScale:scale];
         CGSize size = [image size];
         float scale = 30 / std::max(size.width, size.height);
         [icon_ zoomToScale:scale];

-    }
+    }*/

 
     [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
 
     [name_ setText:[package name]];
     [description_ setText:[package tagline]];
 
 
     [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
 
     [name_ setText:[package name]];
     [description_ setText:[package tagline]];
 

-    NSString *label;
-    bool trusted;
+    NSString *label = nil;
+    bool trusted = false;

 
     if (source != nil) {
         label = [source label];
         trusted = [source trusted];
 
     if (source != nil) {
         label = [source label];
         trusted = [source trusted];

-    } else if ([[package id] isEqualToString:@"firmware"]) {
+    } else if ([[package id] isEqualToString:@"firmware"])

         label = @"Apple";
         label = @"Apple";

-        trusted = false;
-    } else {
+
+    if (label == nil)

         label = @"Unknown/Local";
         label = @"Unknown/Local";

-        trusted = false;
-    }

 
 

-    [source_ setText:[NSString stringWithFormat:@"from %@ (%@)", label, Simplify([package section])]];
+    NSString *from = [NSString stringWithFormat:@"from %@", label];

 
 

-    if (trusted)
-        [self addSubview:trusted_];
-    else
-        [trusted_ removeFromSuperview];
+    NSString *section = Simplify([package section]);
+    if (section != nil && ![section isEqualToString:label])
+        from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
+
+    [source_ setText:from];
+
+#ifdef USE_BADGES
+    [badge_ removeFromSuperview];
+    [status_ removeFromSuperview];
+
+    if (NSString *mode = [package mode]) {
+        [badge_ setImage:[UIImage applicationImageNamed:
+            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+        ]];
+
+        [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
+        [status_ setColor:Blueish_];
+    } else if ([package half]) {
+        [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
+        [status_ setText:@"Package Damaged"];
+        [status_ setColor:Red_];
+    } else {
+        [badge_ setImage:nil];
+        [status_ setText:nil];
+        goto done;
+    }
+
+    [self addSubview:badge_];
+    [self addSubview:status_];
+  done:;
+#endif

 }
 
 - (void) _setSelected:(float)fraction {
 }
 
 - (void) _setSelected:(float)fraction {


@@ -2163,6 +2672,15 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [super _setSelectionFadeFraction:fraction];
 }
 
     [super _setSelectionFadeFraction:fraction];
 }
 

++ (int) heightForPackage:(Package *)package {
+#ifdef USE_BADGES
+    if ([package hasMode] || [package half])
+        return 96;
+    else
+#endif
+        return 73;
+}
+

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


@@ -2258,32 +2776,148 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @end
 /* }}} */
 
 @end
 /* }}} */
 

-/* Browser Interface {{{ */
-@interface BrowserView : RVPage {
+/* File Table {{{ */
+@interface FileTable : RVPage {

     _transient Database *database_;
     _transient Database *database_;

-    UIScroller *scroller_;
-    UIWebView *webview_;
-    NSMutableArray *urls_;
-    UIProgressIndicator *indicator_;
+    Package *package_;
+    NSString *name_;
+    NSMutableArray *files_;
+    UITable *list_;
+}

 
 

-    NSString *title_;
-    bool loading_;
-    bool reloading_;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) setPackage:(Package *)package;
+
+@end
+
+@implementation FileTable
+
+- (void) dealloc {
+    if (package_ != nil)
+        [package_ release];
+    if (name_ != nil)
+        [name_ release];
+    [files_ release];
+    [list_ release];
+    [super dealloc];
+}
+
+- (int) numberOfRowsInTable:(UITable *)table {
+    return files_ == nil ? 0 : [files_ count];
+}
+
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 24;
+}
+
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil) {
+        reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
+        CFRelease(font);
+    }
+    [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
+    return reusing;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return NO;

 }
 
 }
 

-- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
-- (void) loadURL:(NSURL *)url;
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;

 
 

-- (void) loadRequest:(NSURLRequest *)request;
-- (void) reloadURL;
+        files_ = [[NSMutableArray arrayWithCapacity:32] retain];

 
 

-- (WebView *) webView;
+        list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        [self addSubview:list_];

 
 

-- (id) initWithBook:(RVBook *)book database:(Database *)database;
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ] autorelease];
+
+        [list_ setDataSource:self];
+        [list_ setSeparatorStyle:1];
+        [list_ addTableColumn:column];
+        [list_ setDelegate:self];
+        [list_ setReusesTableCells:YES];
+    } return self;
+}
+
+- (void) setPackage:(Package *)package {
+    if (package_ != nil) {
+        [package_ autorelease];
+        package_ = nil;
+    }
+
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
+
+    [files_ removeAllObjects];
+
+    if (package != nil) {
+        package_ = [package retain];
+        name_ = [[package id] retain];
+
+        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
+
+        {
+            std::ifstream fin([path UTF8String]);
+            std::string line;
+            while (std::getline(fin, line))
+                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
+        }
+
+        if ([files_ count] != 0) {
+            if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
+                [files_ removeObjectAtIndex:0];
+            [files_ sortUsingSelector:@selector(compareByPath:)];
+
+            NSMutableArray *stack = [NSMutableArray arrayWithCapacity:8];
+            [stack addObject:@"/"];
+
+            for (int i(0), e([files_ count]); i != e; ++i) {
+                NSString *file = [files_ objectAtIndex:i];
+                while (![file hasPrefix:[stack lastObject]])
+                    [stack removeLastObject];
+                NSString *directory = [stack lastObject];
+                [stack addObject:[file stringByAppendingString:@"/"]];
+                [files_ replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%*s%@",
+                    ([stack count] - 2) * 3, "",
+                    [file substringFromIndex:[directory length]]
+                ]];
+            }
+        }
+    }
+
+    [list_ reloadData];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];
+}
+
+- (NSString *) title {
+    return @"Installed Files";
+}
+
+- (NSString *) backButtonTitle {
+    return @"Files";
+}

 
 @end
 /* }}} */
 
 @end
 /* }}} */

-

 /* Package View {{{ */
 @protocol PackageViewDelegate
 - (void) performPackage:(Package *)package;
 /* Package View {{{ */
 @protocol PackageViewDelegate
 - (void) performPackage:(Package *)package;


@@ -2295,6 +2929,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     Package *package_;
     NSString *name_;
     UITextView *description_;
     Package *package_;
     NSString *name_;
     UITextView *description_;

+    NSMutableArray *buttons_;

 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;


@@ -2315,117 +2950,155 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     if (description_ != nil)
         [description_ release];
     [table_ release];
     if (description_ != nil)
         [description_ release];
     [table_ release];

+    [buttons_ release];

     [super dealloc];
 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
     [super dealloc];
 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {

-    return [package_ source] == nil ? 2 : 3;
+    int number = 2;
+    if ([package_ installed] != nil)
+        ++number;
+    if ([package_ source] != nil)
+        ++number;
+    return number;

 }
 
 - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
 }
 
 - (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {

-    switch (group) {
-        case 0: return nil;
-        case 1: return @"Package Details";
-        case 2: return @"Source Information";
-
-        default: _assert(false);
-    }
+    if (group-- == 0)
+        return nil;
+    else if ([package_ installed] != nil && group-- == 0)
+        return @"Installed Package";
+    else if (group-- == 0)
+        return @"Package Details";
+    else if ([package_ source] != nil && group-- == 0)
+        return @"Source Information";
+    else _assert(false);

 }
 
 - (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
 }
 
 - (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {

-    if (group != 0 || row != 1)
+    if (description_ == nil || group != 0 || row != 1)

         return proposed;
     else
         return [description_ visibleTextRect].size.height + TextViewOffset_;
 }
 
 - (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
         return proposed;
     else
         return [description_ visibleTextRect].size.height + TextViewOffset_;
 }
 
 - (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {

-    switch (group) {
-        case 0: return [package_ website] == nil ? 2 : 3;
-        case 1: return 5;
-        case 2: return 3;
-
-        default: _assert(false);
-    }
+    if (group-- == 0) {
+        int number = 1;
+        if ([package_ author] != nil)
+            ++number;
+        if (description_ != nil)
+            ++number;
+        if ([package_ website] != nil)
+            ++number;
+        return number;
+    } else if ([package_ installed] != nil && group-- == 0)
+        return 2;
+    else if (group-- == 0) {
+        int number = 2;
+        if ([package_ size] != 0)
+            ++number;
+        if ([package_ maintainer] != nil)
+            ++number;
+        if ([package_ sponsor] != nil)
+            ++number;
+        if ([package_ relationships] != nil)
+            ++number;
+        if ([[package_ source] trusted])
+            ++number;
+        return number;
+    } else if ([package_ source] != nil && group-- == 0) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+        int number = 1;
+        if (description != nil && ![description isEqualToString:[source label]])
+            ++number;
+        if ([source origin] != nil)
+            ++number;
+        return number;
+    } else _assert(false);

 }
 
 - (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
     UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
     [cell setShowSelection:NO];
 
 }
 
 - (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
     UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
     [cell setShowSelection:NO];
 

-    switch (group) {
-        case 0: switch (row) {
-            case 0:
-                [cell setTitle:[package_ name]];
-                [cell setValue:[package_ latest]];
-            break;
-
-            case 1:
-                [cell addSubview:description_];
-            break;
-
-            case 2:
-                [cell setTitle:@"More Information"];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
-
-            default: _assert(false);
-        } break;
-
-        case 1: switch (row) {
-            case 0:
-                [cell setTitle:@"Identifier"];
-                [cell setValue:[package_ id]];
-            break;
-
-            case 1: {
-                [cell setTitle:@"Installed Version"];
-                NSString *installed([package_ installed]);
-                [cell setValue:(installed == nil ? @"n/a" : installed)];
-            } break;
-
-            case 2: {
-                [cell setTitle:@"Section"];
-                NSString *section([package_ section]);
-                [cell setValue:(section == nil ? @"n/a" : section)];
-            } break;
-
-            case 3:
-                [cell setTitle:@"Expanded Size"];
-                [cell setValue:SizeString([package_ size])];
-            break;
-
-            case 4:
-                [cell setTitle:@"Maintainer"];
-                [cell setValue:[[package_ maintainer] name]];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
-
-            default: _assert(false);
-        } break;
-
-        case 2: switch (row) {
-            case 0:
-                [cell setTitle:[[package_ source] label]];
-                [cell setValue:[[package_ source] version]];
-            break;
-
-            case 1:
-                [cell setValue:[[package_ source] description]];
-            break;
-
-            case 2:
-                [cell setTitle:@"Origin"];
-                [cell setValue:[[package_ source] origin]];
-            break;
-
-            default: _assert(false);
-        } break;
-
-        default: _assert(false);
-    }
+    if (group-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
+            [cell setTitle:[package_ name]];
+            [cell setValue:[package_ latest]];
+        } else if ([package_ author] != nil && row-- == 0) {
+            [cell setTitle:@"Author"];
+            [cell setValue:[[package_ author] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if (description_ != nil && row-- == 0) {
+            [cell addSubview:description_];
+        } else if ([package_ website] != nil && row-- == 0) {
+            [cell setTitle:@"More Information"];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else _assert(false);
+    } else if ([package_ installed] != nil && group-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
+            [cell setTitle:@"Version"];
+            NSString *installed([package_ installed]);
+            [cell setValue:(installed == nil ? @"n/a" : installed)];
+        } else if (row-- == 0) {
+            [cell setTitle:@"Filesystem Content"];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else _assert(false);
+    } else if (group-- == 0) {
+        if (false) {
+        } else if (row-- == 0) {
+            [cell setTitle:@"Identifier"];
+            [cell setValue:[package_ id]];
+        } else if (row-- == 0) {
+            [cell setTitle:@"Section"];
+            NSString *section([package_ section]);
+            [cell setValue:(section == nil ? @"n/a" : section)];
+        } else if ([package_ size] != 0 && row-- == 0) {
+            [cell setTitle:@"Expanded Size"];
+            [cell setValue:SizeString([package_ size])];
+        } else if ([package_ maintainer] != nil && row-- == 0) {
+            [cell setTitle:@"Maintainer"];
+            [cell setValue:[[package_ maintainer] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if ([package_ sponsor] != nil && row-- == 0) {
+            [cell setTitle:@"Sponsor"];
+            [cell setValue:[[package_ sponsor] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if ([package_ relationships] != nil && row-- == 0) {
+            [cell setTitle:@"Package Relationships"];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if ([[package_ source] trusted] && row-- == 0) {
+            [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
+            [cell setValue:@"This package has been signed."];
+        } else _assert(false);
+    } else if ([package_ source] != nil && group-- == 0) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+
+        if (false) {
+        } else if (row-- == 0) {
+            NSString *label = [source label];
+            if (label == nil)
+                label = [source uri];
+            [cell setTitle:label];
+            [cell setValue:[source version]];
+        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
+            [cell setValue:description];
+        } else if ([source origin] != nil && row-- == 0) {
+            [cell setTitle:@"Origin"];
+            [cell setValue:[source origin]];
+        } else _assert(false);
+    } else _assert(false);

 
     return cell;
 }
 
     return cell;
 }


@@ -2436,58 +3109,116 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [table_ selectedRow];
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [table_ selectedRow];

-    NSString *website = [package_ website];
-
-    if (row == (website == nil ? 8 : 9))
-        [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-            [[package_ maintainer] email],
-            [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
-        ]]];
-    else if (website != nil && row == 3) {
-        NSURL *url = [NSURL URLWithString:website];
-        BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
-        [browser setDelegate:delegate_];
-        [book_ pushPage:browser];
-        [browser loadURL:url];
-    }
+    if (row == INT_MAX)
+        return;
+
+    #define _else else goto _label; return; } _label:
+
+    if (true) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if ([package_ author] != nil && row-- == 0) {
+            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+                [[package_ author] email],
+                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+                    [package_ name]
+                ] stringByAddingPercentEscapes]
+            ]]];
+        } else if (description_ != nil && row-- == 0) {
+        } else if ([package_ website] != nil && row-- == 0) {
+            NSURL *url = [NSURL URLWithString:[package_ website]];
+            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+            [browser setDelegate:delegate_];
+            [book_ pushPage:browser];
+            [browser loadURL:url];
+    } _else if ([package_ installed] != nil) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (row-- == 0) {
+            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+            [files setDelegate:delegate_];
+            [files setPackage:package_];
+            [book_ pushPage:files];
+    } _else if (true) {
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if ([package_ size] != 0 && row-- == 0) {
+        } else if ([package_ maintainer] != nil && row-- == 0) {
+            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+                [[package_ maintainer] email],
+                [[NSString stringWithFormat:@"regarding apt package \"%@\"",
+                    [package_ name]
+                ] stringByAddingPercentEscapes]
+            ]]];
+        } else if ([package_ sponsor] != nil && row-- == 0) {
+            NSURL *url = [NSURL URLWithString:[[package_ sponsor] email]];
+            BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+            [browser setDelegate:delegate_];
+            [book_ pushPage:browser];
+            [browser loadURL:url];
+        } else if ([package_ relationships] != nil && row-- == 0) {
+        } else if ([[package_ source] trusted] && row-- == 0) {
+    } _else if ([package_ source] != nil) {
+        Source *source = [package_ source];
+        NSString *description = [source description];
+
+        if (row-- == 0) {
+        } else if (row-- == 0) {
+        } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
+        } else if ([source origin] != nil && row-- == 0) {
+    } _else _assert(false);
+
+    #undef _else
+}
+
+- (void) _clickButtonWithName:(NSString *)name {
+    if ([name isEqualToString:@"Install"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Reinstall"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Remove"])
+        [delegate_ removePackage:package_];
+    else if ([name isEqualToString:@"Upgrade"])
+        [delegate_ installPackage:package_];
+    else _assert(false);

 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {

-    switch (button) {
-        case 1: [delegate_ installPackage:package_]; break;
-        case 2: [delegate_ removePackage:package_]; break;
-    }
+    int count = [buttons_ count];
+    _assert(count != 0);
+    _assert(button <= count + 1);
+
+    if (count != button - 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];

 
     [sheet dismiss];
 }
 
 - (void) _rightButtonClicked {
 
     [sheet dismiss];
 }
 
 - (void) _rightButtonClicked {

-    if ([package_ installed] == nil)
-        [delegate_ installPackage:package_];
-    else {
-        NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:6];
-
-        if ([package_ upgradable])
-            [buttons addObject:@"Upgrade"];
-        else
-            [buttons addObject:@"Reinstall"];
+    int count = [buttons_ count];
+    _assert(count != 0);

 
 

-        [buttons addObject:@"Remove"];
+    if (count == 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:0]];
+    else {
+        NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
+        [buttons addObjectsFromArray:buttons_];

         [buttons addObject:@"Cancel"];
 
         [delegate_ slideUp:[[[UIAlertSheet alloc]
         [buttons addObject:@"Cancel"];
 
         [delegate_ slideUp:[[[UIAlertSheet alloc]

-            initWithTitle:@"Manage Package"
+            initWithTitle:nil

             buttons:buttons
             defaultButtonIndex:2
             delegate:self
             buttons:buttons
             defaultButtonIndex:2
             delegate:self

-            context:self
+            context:@"manage"

         ] autorelease]];
     }
 }
 
 - (NSString *) rightButtonTitle {
         ] autorelease]];
     }
 }
 
 - (NSString *) rightButtonTitle {

-    _assert(package_ != nil);
-    return [package_ installed] == nil ? @"Install" : @"Modify";
+    int count = [buttons_ count];
+    return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];

 }
 
 - (NSString *) title {
 }
 
 - (NSString *) title {


@@ -2503,6 +3234,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         [table_ setDataSource:self];
         [table_ setDelegate:self];
 
         [table_ setDataSource:self];
         [table_ setDelegate:self];

+
+        buttons_ = [[NSMutableArray alloc] initWithCapacity:4];

     } return self;
 }
 
     } return self;
 }
 


@@ -2522,6 +3255,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         description_ = nil;
     }
 
         description_ = nil;
     }
 

+    [buttons_ removeAllObjects];
+

     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];


@@ -2529,11 +3264,22 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         NSString *description([package description]);
         if (description == nil)
             description = [package tagline];
         NSString *description([package description]);
         if (description == nil)
             description = [package tagline];

-        description_ = [GetTextView(description, 12, true) retain];
-
-        [description_ setTextColor:Black_];
+        if (description != nil) {
+            description_ = [GetTextView(description, 12, true) retain];
+            [description_ setTextColor:Black_];
+        }

 
         [table_ reloadData];
 
         [table_ reloadData];

+
+        if ([package_ source] == nil);
+        else if ([package_ upgradableAndEssential:NO])
+            [buttons_ addObject:@"Upgrade"];
+        else if ([package_ installed] == nil)
+            [buttons_ addObject:@"Install"];
+        else
+            [buttons_ addObject:@"Reinstall"];
+        if ([package_ installed] != nil)
+            [buttons_ addObject:@"Remove"];

     }
 }
 
     }
 }
 


@@ -2567,6 +3313,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (void) reloadData;
 - (void) resetCursor;
 
 - (void) reloadData;
 - (void) resetCursor;
 

+- (UISectionList *) list;
+
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide;
+

 @end
 
 @implementation PackageTable
 @end
 
 @implementation PackageTable


@@ -2600,7 +3350,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {

-    return 73;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];

 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {


@@ -2681,8 +3431,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             [packages_ addObject:package];
     }
 
             [packages_ addObject:package];
     }
 

-    [packages_ sortUsingSelector:@selector(compareByName:)];
-

     Section *section = nil;
 
     for (size_t offset(0); offset != [packages_ count]; ++offset) {
     Section *section = nil;
 
     for (size_t offset(0); offset != [packages_ count]; ++offset) {


@@ -2712,6 +3460,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
 }
 
     [[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
 }
 

+- (UISectionList *) list {
+    return list_;
+}
+
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide {
+    [list_ setShouldHideHeaderInShortLists:hide];
+}
+

 @end
 /* }}} */
 
 @end
 /* }}} */
 


@@ -2743,9 +3499,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         timeoutInterval:30.0
     ];
 
         timeoutInterval:30.0
     ];
 

-    [request addValue:[NSString stringWithCString:Firmware_] forHTTPHeaderField:@"X-Firmware"];
-    [request addValue:[NSString stringWithCString:Machine_] forHTTPHeaderField:@"X-Machine"];
-    [request addValue:[NSString stringWithCString:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+    [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
+    [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+    [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];

 
     [self loadRequest:request];
 }
 
     [self loadRequest:request];
 }


@@ -2812,7 +3568,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 buttons:[NSArray arrayWithObjects:@"Close", nil]
                 defaultButtonIndex:0
                 delegate:self
                 buttons:[NSArray arrayWithObjects:@"Close", nil]
                 defaultButtonIndex:0
                 delegate:self

-                context:self
+                context:@"missing"

             ] autorelease];
 
             [sheet setBodyText:[NSString stringWithFormat:
             ] autorelease];
 
             [sheet setBodyText:[NSString stringWithFormat:


@@ -2914,9 +3670,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [webview_ setDelegate:self];
         //[webview_ setEnabledGestures:2];
 
         [webview_ setDelegate:self];
         //[webview_ setEnabledGestures:2];
 

-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:0];
-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 43, indsize.width, indsize.height)];
-        [indicator_ setStyle:0];
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
+        [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];

 
         Package *package([database_ packageWithName:@"cydia"]);
         NSString *application = package == nil ? @"Cydia" : [NSString
 
         Package *package([database_ packageWithName:@"cydia"]);
         NSString *application = package == nil ? @"Cydia" : [NSString


@@ -2940,11 +3696,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 - (void) _leftButtonClicked {
     UIAlertSheet *sheet = [[[UIAlertSheet alloc]
 
 - (void) _leftButtonClicked {
     UIAlertSheet *sheet = [[[UIAlertSheet alloc]

-        initWithTitle:@"About Cydia Packager"
+        initWithTitle:@"About Cydia Installer"

         buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0
         delegate:self
         buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0
         delegate:self

-        context:self
+        context:@"about"

     ] autorelease];
 
     [sheet setBodyText:
     ] autorelease];
 
     [sheet setBodyText:


@@ -3022,6 +3778,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     NSMutableArray *packages_;
     NSMutableArray *sections_;
     UITable *list_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;
     UITable *list_;

+    UIView *accessory_;

 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;


@@ -3038,6 +3795,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [packages_ release];
     [sections_ release];
     [list_ release];
     [packages_ release];
     [sections_ release];
     [list_ release];

+    [accessory_ release];

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


@@ -3066,14 +3824,23 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         return;
 
     Section *section;
         return;
 
     Section *section;

+    NSString *name;

     NSString *title;
 
     if (row == 0) {
         section = nil;
     NSString *title;
 
     if (row == 0) {
         section = nil;

+        name = nil;

         title = @"All Packages";
     } else {
         section = [sections_ objectAtIndex:(row - 1)];
         title = @"All Packages";
     } else {
         section = [sections_ objectAtIndex:(row - 1)];

-        title = [section name];
+        name = [section name];
+
+        if (name != nil)
+            title = name;
+        else {
+            name = @"";
+            title = @"(No Section)";
+        }

     }
 
     PackageTable *table = [[[PackageTable alloc]
     }
 
     PackageTable *table = [[[PackageTable alloc]


@@ -3081,7 +3848,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         database:database_
         title:title
         filter:@selector(isUninstalledInSection:)
         database:database_
         title:title
         filter:@selector(isUninstalledInSection:)

-        with:(section == nil ? nil : [section name])
+        with:name

     ] autorelease];
 
     [table setDelegate:delegate_];
     ] autorelease];
 
     [table setDelegate:delegate_];


@@ -3123,7 +3890,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);

-        if ([package installed] == nil)
+        if ([package valid] && [package installed] == nil)

             [packages_ addObject:package];
     }
 
             [packages_ addObject:package];
     }
 


@@ -3157,6 +3924,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     return @"Sections";
 }
 
     return @"Sections";
 }
 

+- (UIView *) accessoryView {
+    return accessory_;
+}
+

 @end
 /* }}} */
 /* Changes View {{{ */
 @end
 /* }}} */
 /* Changes View {{{ */


@@ -3202,7 +3973,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {

-    return 73;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];

 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {


@@ -3274,7 +4045,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);

-        if ([package installed] == nil || [package upgradable])
+        if ([package installed] == nil && [package valid] || [package upgradableAndEssential:NO])

             [packages_ addObject:package];
     }
 
             [packages_ addObject:package];
     }
 


@@ -3286,13 +4057,12 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     upgrades_ = 0;
     bool unseens = false;
 
     upgrades_ = 0;
     bool unseens = false;
 

-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);

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

-        if ([package upgradable]) {
+        if ([package upgradableAndEssential:YES]) {

             ++upgrades_;
             [upgradable addToCount];
         } else {
             ++upgrades_;
             [upgradable addToCount];
         } else {


@@ -3318,7 +4088,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     }
 
     CFRelease(formatter);
     }
 
     CFRelease(formatter);

-    CFRelease(locale);

 
     if (unseens) {
         Section *last = [sections_ lastObject];
 
     if (unseens) {
         Section *last = [sections_ lastObject];


@@ -3396,6 +4165,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UIPreferencesTable *advanced_;
     UIView *dimmed_;
     bool flipped_;
     UIPreferencesTable *advanced_;
     UIView *dimmed_;
     bool flipped_;

+    bool reload_;

 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;


@@ -3420,30 +4190,94 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [super dealloc];
 }
 
     [super dealloc];
 }
 

+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    return 1;
+}
+
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    switch (group) {
+        case 0: return @"Advanced Search (Coming Soon!)";
+
+        default: _assert(false);
+    }
+}
+
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    switch (group) {
+        case 0: return 0;
+
+        default: _assert(false);
+    }
+}
+
+- (void) _showKeyboard:(BOOL)show {
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = [book_ pageBounds];
+    CGRect keyup = keydown;
+    keyup.size.height -= keysize.height - ButtonBarHeight_;
+
+    float delay = KeyboardTime_ * ButtonBarHeight_ / keysize.height;
+
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:[table_ list]] autorelease];
+    [animation setSignificantRectFields:8];
+
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
+    } else {
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];
+    }
+
+    UIAnimator *animator = [UIAnimator sharedAnimator];
+
+    [animator
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:(KeyboardTime_ - delay)
+        start:!show
+    ];
+
+    if (show)
+        [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
+
+#ifndef __OBJC2__
+    [delegate_ showKeyboard:show];
+#endif
+}
+

 - (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
 - (void) textFieldDidBecomeFirstResponder:(UITextField *)field {

-    [delegate_ showKeyboard:YES];
-    [table_ setEnabled:NO];
-    [self addSubview:dimmed_];
+    [self _showKeyboard:YES];

 }
 
 - (void) textFieldDidResignFirstResponder:(UITextField *)field {
 }
 
 - (void) textFieldDidResignFirstResponder:(UITextField *)field {

-    [dimmed_ removeFromSuperview];
-    [table_ setEnabled:YES];
-    [delegate_ showKeyboard:NO];
+    [self _showKeyboard:NO];

 }
 
 - (void) keyboardInputChanged:(UIFieldEditor *)editor {
 }
 
 - (void) keyboardInputChanged:(UIFieldEditor *)editor {

-    NSString *text([field_ text]);
-    [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
+    if (reload_) {
+        NSString *text([field_ text]);
+        [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
+        [self reloadData];
+        reload_ = false;
+    }
+}
+
+- (void) textFieldClearButtonPressed:(UITextField *)field {
+    reload_ = true;
+}
+
+- (void) keyboardInputShouldDelete:(id)input {
+    reload_ = true;

 }
 
 - (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {
 }
 
 - (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {

-    if ([text length] != 1 || [text characterAtIndex:0] != '\n')
+    if ([text length] != 1 || [text characterAtIndex:0] != '\n') {
+        reload_ = true;

         return YES;
         return YES;

-
-    [self reloadData];
-    [field_ resignFirstResponder];
-    return NO;
+    } else {
+        [field_ resignFirstResponder];
+        return NO;
+    }

 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database {


@@ -3454,15 +4288,19 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
         [self addSubview:pinstripe];*/
 
         [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
         [self addSubview:pinstripe];*/
 

-        dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
-        CGColor dimmed(space_, 0, 0, 0, 0.5);
-        [dimmed_ setBackgroundColor:dimmed];
-

         transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
         [self addSubview:transition_];
 
         advanced_ = [[UIPreferencesTable alloc] initWithFrame:pageBounds];
 
         transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
         [self addSubview:transition_];
 
         advanced_ = [[UIPreferencesTable alloc] initWithFrame:pageBounds];
 

+        [advanced_ setReusesTableCells:YES];
+        [advanced_ setDataSource:self];
+        [advanced_ reloadData];
+
+        dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
+        CGColor dimmed(space_, 0, 0, 0, 0.5);
+        [dimmed_ setBackgroundColor:dimmed];
+

         table_ = [[PackageTable alloc]
             initWithBook:book
             database:database
         table_ = [[PackageTable alloc]
             initWithBook:book
             database:database


@@ -3471,14 +4309,25 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             with:nil
         ];
 
             with:nil
         ];
 

+        [table_ setShouldHideHeaderInShortLists:NO];

         [transition_ transition:0 toView:table_];
 
         [transition_ transition:0 toView:table_];
 

-        CGRect cnfrect = {{1, 38}, {17, 18}};
+        CGRect cnfrect = {{
+#ifdef __OBJC2__
+        6 +
+#endif
+        1, 38}, {17, 18}};

 
         CGRect area;
 
         CGRect area;

-        area.origin.x = cnfrect.size.width + 15;
+        area.origin.x = cnfrect.origin.x + cnfrect.size.width + 14;

         area.origin.y = 30;
         area.origin.y = 30;

-        area.size.width = [self bounds].size.width - area.origin.x - 18;
+
+        area.size.width =
+#ifdef __OBJC2__
+            8 +
+#endif
+            [self bounds].size.width - area.origin.x - 18;
+

         area.size.height = [UISearchField defaultHeight];
 
         field_ = [[UISearchField alloc] initWithFrame:area];
         area.size.height = [UISearchField defaultHeight];
 
         field_ = [[UISearchField alloc] initWithFrame:area];


@@ -3488,9 +4337,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         CFRelease(font);
 
         [field_ setPlaceholder:@"Package Names & Descriptions"];
         CFRelease(font);
 
         [field_ setPlaceholder:@"Package Names & Descriptions"];

-        [field_ setPaddingTop:5];

         [field_ setDelegate:self];
 
         [field_ setDelegate:self];
 

+#ifdef __OBJC2__
+        [field_ setPaddingTop:3];
+#else
+        [field_ setPaddingTop:5];
+#endif
+

 #ifndef __OBJC2__
         UITextTraits *traits = [field_ textTraits];
         [traits setEditingDelegate:self];
 #ifndef __OBJC2__
         UITextTraits *traits = [field_ textTraits];
         [traits setEditingDelegate:self];


@@ -3499,18 +4353,21 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [traits setAutoCorrectionType:1];
 #endif
 
         [traits setAutoCorrectionType:1];
 #endif
 

+        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
+
+        accessory_ = [[UIView alloc] initWithFrame:accrect];
+        [accessory_ addSubview:field_];
+

         UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
         [configure setShowPressFeedback:YES];
         [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
         [configure addTarget:self action:@selector(configurePushed) forEvents:1];
         UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
         [configure setShowPressFeedback:YES];
         [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
         [configure addTarget:self action:@selector(configurePushed) forEvents:1];

-
-        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, cnfrect.size.width + area.size.width + 6 * 3, area.size.height + 30)];
-        [accessory_ addSubview:field_];

         [accessory_ addSubview:configure];
     } return self;
 }
 
 - (void) flipPage {
         [accessory_ addSubview:configure];
     } return self;
 }
 
 - (void) flipPage {

+#ifndef __OBJC2__

     LKAnimation *animation = [LKTransition animation];
     [animation setType:@"oglFlip"];
     [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];
     LKAnimation *animation = [LKTransition animation];
     [animation setType:@"oglFlip"];
     [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];


@@ -3522,6 +4379,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [[transition_ _layer] addAnimation:animation forKey:0];
     [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
     flipped_ = !flipped_;
     [[transition_ _layer] addAnimation:animation forKey:0];
     [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
     flipped_ = !flipped_;

+#endif

 }
 
 - (void) configurePushed {
 }
 
 - (void) configurePushed {


@@ -3611,23 +4469,33 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     if ((self = [super initWithFrame:frame]) != nil) {
         database_ = database;
 
     if ((self = [super initWithFrame:frame]) != nil) {
         database_ = database;
 

+        if (Advanced_)
+            [navbar_ setBarStyle:1];
+

         CGRect ovrrect = [navbar_ bounds];
         CGRect ovrrect = [navbar_ bounds];

-        ovrrect.size.height = [UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height;
+        ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height);

 
         overlay_ = [[UIView alloc] initWithFrame:ovrrect];
 
 
         overlay_ = [[UIView alloc] initWithFrame:ovrrect];
 

-        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2];
+        UIProgressIndicatorStyle style = Advanced_ ?
+            kUIProgressIndicatorStyleSmallWhite :
+            kUIProgressIndicatorStyleSmallBlack;
+
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];

         unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
         CGRect indrect = {{indoffset, indoffset}, indsize};
 
         indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
         unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
         CGRect indrect = {{indoffset, indoffset}, indsize};
 
         indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];

-        [indicator_ setStyle:2];
+        [indicator_ setStyle:style];

         [overlay_ addSubview:indicator_];
 
         [overlay_ addSubview:indicator_];
 

-        CGSize prmsize = {200, indsize.width};
+        CGSize prmsize = {200, indsize.width + 4};

 
         CGRect prmrect = {{
             indoffset * 2 + indsize.width,
 
         CGRect prmrect = {{
             indoffset * 2 + indsize.width,

+#ifdef __OBJC2__
+            -1 +
+#endif

             (ovrrect.size.height - prmsize.height) / 2
         }, prmsize};
 
             (ovrrect.size.height - prmsize.height) / 2
         }, prmsize};
 


@@ -3635,7 +4503,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 
 
         prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 

-        [prompt_ setColor:White_];
+        [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];

         [prompt_ setBackgroundColor:Clear_];
         [prompt_ setFont:font];
 
         [prompt_ setBackgroundColor:Clear_];
         [prompt_ setFont:font];
 


@@ -3673,12 +4541,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [pool release];
 }
 
     [pool release];
 }
 

-- (void) setProgressError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setProgressError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];

 }
 
 - (void) setProgressTitle:(NSString *)title {
 }
 
 - (void) setProgressTitle:(NSString *)title {


@@ -3704,10 +4568,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [sheet dismiss];
 }
 
     [sheet dismiss];
 }
 

-- (void) _setProgressError:(NSString *)error {
-    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
-}
-

 - (void) _setProgressTitle:(NSString *)title {
     [prompt_ setText:[title stringByAppendingString:@"..."]];
 }
 - (void) _setProgressTitle:(NSString *)title {
     [prompt_ setText:[title stringByAppendingString:@"..."]];
 }


@@ -3732,18 +4592,59 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     ConfirmationView *confirm_;
 
 
     ConfirmationView *confirm_;
 

+    NSMutableArray *essential_;
+    NSMutableArray *broken_;
+

     Database *database_;
     ProgressView *progress_;
 
     unsigned tag_;
 
     UIKeyboard *keyboard_;
     Database *database_;
     ProgressView *progress_;
 
     unsigned tag_;
 
     UIKeyboard *keyboard_;

+
+    InstallView *install_;
+    ChangesView *changes_;
+    ManageView *manage_;
+    SearchView *search_;

 }
 
 @end
 
 @implementation Cydia
 
 }
 
 @end
 
 @implementation Cydia
 

+- (void) _loaded {
+    if ([broken_ count] != 0) {
+        int count = [broken_ count];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:
+                @"Forcibly Clear",
+                @"Ignore (Temporary)",
+            nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"fixhalf"
+        ] autorelease];
+
+        [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."];
+        [sheet popupAlertAnimated:YES];
+    } else if (!Ignored_ && [essential_ count] != 0) {
+        int count = [essential_ count];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"upgrade"
+        ] autorelease];
+
+        [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."];
+        [sheet popupAlertAnimated:YES];
+    }
+}
+

 - (void) _reloadData {
     /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
     [hud setText:@"Reloading Data"];
 - (void) _reloadData {
     /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
     [hud setText:@"Reloading Data"];


@@ -3752,20 +4653,26 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     [database_ reloadData];
 
 
     [database_ reloadData];
 

-    size_t count = 16;
-

     if (Packages_ == nil) {
     if (Packages_ == nil) {

-        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:count];
+        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:128];

         [Metadata_ setObject:Packages_ forKey:@"Packages"];
     }
 
     size_t changes(0);
 
         [Metadata_ setObject:Packages_ forKey:@"Packages"];
     }
 
     size_t changes(0);
 

+    [essential_ removeAllObjects];
+    [broken_ removeAllObjects];
+

     NSArray *packages = [database_ packages];
     for (int i(0), e([packages count]); i != e; ++i) {
         Package *package = [packages objectAtIndex:i];
     NSArray *packages = [database_ packages];
     for (int i(0), e([packages count]); i != e; ++i) {
         Package *package = [packages objectAtIndex:i];

-        if ([package upgradable])
+        if ([package half])
+            [broken_ addObject:package];
+        if ([package upgradableAndEssential:NO]) {
+            if ([package essential])
+                [essential_ addObject:package];

             ++changes;
             ++changes;

+        }

     }
 
     if (changes != 0) {
     }
 
     if (changes != 0) {


@@ -3781,9 +4688,31 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [self removeApplicationBadge];
     }
 
         [self removeApplicationBadge];
     }
 

-    _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+    if (Changed_) {
+        _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+        Changed_ = false;
+    }
+
+    /* XXX: this is just stupid */
+    if (tag_ != 2)
+        [install_ reloadData];
+    if (tag_ != 3)
+        [changes_ reloadData];
+    if (tag_ != 4)
+        [manage_ reloadData];
+    if (tag_ != 5)
+        [search_ reloadData];

 
     [book_ reloadData];
 
     [book_ reloadData];

+
+    if ([packages count] == 0);
+    else if (Loaded_)
+        [self _loaded];
+    else {
+        Loaded_ = YES;
+        [book_ update];
+    }
+

     /*[hud show:NO];
     [hud removeFromSuperview];*/
 }
     /*[hud show:NO];
     [hud removeFromSuperview];*/
 }


@@ -3823,7 +4752,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             buttons:[NSArray arrayWithObjects:@"Okay", nil]
             defaultButtonIndex:0
             delegate:self
             buttons:[NSArray arrayWithObjects:@"Okay", nil]
             defaultButtonIndex:0
             delegate:self

-            context:self
+            context:@"broken"

         ] autorelease];
 
         [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];
         ] autorelease];
 
         [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];


@@ -3866,7 +4795,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
 
 - (void) confirm {
     [overlay_ removeFromSuperview];

-    restart_ = true;
+    reload_ = true;

 
     [progress_
         detachNewThreadSelector:@selector(perform)
 
     [progress_
         detachNewThreadSelector:@selector(perform)


@@ -3906,15 +4835,67 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {

+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"fixhalf"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
+                        Package *broken = [broken_ objectAtIndex:i];
+                        [broken remove];
+
+                        NSString *id = [broken id];
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;
+
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"upgrade"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
+                        Package *essential = [essential_ objectAtIndex:i];
+                        [essential install];
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                Ignored_ = YES;
+            break;
+
+            default:
+                _assert(false);
+        }
+

     [sheet dismiss];
 }
 
 - (void) setPage:(RVPage *)page {
     [sheet dismiss];
 }
 
 - (void) setPage:(RVPage *)page {

+    [page resetViewAnimated:NO];

     [page setDelegate:self];
     [book_ setPage:page];
 }
 
     [page setDelegate:self];
     [book_ setPage:page];
 }
 

-- (RVPage *) _setNewsPage {
+- (RVPage *) _setHomePage {

     BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
     [self setPage:browser];
     [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];
     BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
     [self setPage:browser];
     [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];


@@ -3929,28 +4910,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     }
 
     switch (tag) {
     }
 
     switch (tag) {

-        case 1:
-            [self _setNewsPage];
-        break;
+        case 1: [self _setHomePage]; break;

 
 

-        case 2:
-            [self setPage:[[[InstallView alloc] initWithBook:book_ database:database_] autorelease]];
-        break;
-
-        case 3:
-            [self setPage:[[[ChangesView alloc] initWithBook:book_ database:database_] autorelease]];
-        break;
-
-        case 4:
-            [self setPage:[[[ManageView alloc] initWithBook:book_ database:database_] autorelease]];
-        break;
-
-        case 5:
-            [self setPage:[[[SearchView alloc] initWithBook:book_ database:database_] autorelease]];
-        break;
+        case 2: [self setPage:install_]; break;
+        case 3: [self setPage:changes_]; break;
+        case 4: [self setPage:manage_]; break;
+        case 5: [self setPage:search_]; break;

 
 

-        default:
-            _assert(false);
+        default: _assert(false);

     }
 
     tag_ = tag;
     }
 
     tag_ = tag;


@@ -3959,11 +4926,22 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (void) applicationWillSuspend {
     [super applicationWillSuspend];
 
 - (void) applicationWillSuspend {
     [super applicationWillSuspend];
 

-    if (restart_)
-        if (FW_LEAST(1,1,3))
-            notify_post("com.apple.language.changed");
-        else
-            system("launchctl stop com.apple.SpringBoard");
+    [database_ clean];
+
+    if (reload_) {
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            sleep(1);
+            if (pid_t child = fork())
+                waitpid(child, NULL, 0);
+            else {
+                execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
+                exit(0);
+            }
+            execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
+            exit(0);
+        }
+    }

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


@@ -3973,6 +4951,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     confirm_ = nil;
     tag_ = 1;
 
     confirm_ = nil;
     tag_ = 1;
 

+    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+

     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 


@@ -3980,7 +4961,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [window_ makeKey: self];
     [window_ _setHidden: NO];
 
     [window_ makeKey: self];
     [window_ _setHidden: NO];
 

-    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] delegate:self];
+    database_ = [[Database alloc] init];
+    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
+    [database_ setDelegate:progress_];

     [window_ setContentView:progress_];
 
     underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
     [window_ setContentView:progress_];
 
     underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];


@@ -3991,9 +4974,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     if (!bootstrap_)
         [underlay_ addSubview:overlay_];
 
     if (!bootstrap_)
         [underlay_ addSubview:overlay_];
 

-    database_ = [[Database alloc] init];
-    [database_ setDelegate:progress_];
-

     book_ = [[CYBook alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
     ) database:database_];
     book_ = [[CYBook alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
     ) database:database_];


@@ -4005,11 +4985,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     NSArray *buttonitems = [NSArray arrayWithObjects:
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
     NSArray *buttonitems = [NSArray arrayWithObjects:
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,

-            @"news-up.png", kUIButtonBarButtonInfo,
-            @"news-dn.png", kUIButtonBarButtonSelectedInfo,
+            @"home-up.png", kUIButtonBarButtonInfo,
+            @"home-dn.png", kUIButtonBarButtonSelectedInfo,

             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,

-            @"News", kUIButtonBarButtonTitle,
+            @"Home", kUIButtonBarButtonTitle,

             @"0", kUIButtonBarButtonType,
         nil],
 
             @"0", kUIButtonBarButtonType,
         nil],
 


@@ -4057,8 +5037,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     buttonbar_ = [[UIButtonBar alloc]
         initInView:overlay_
         withFrame:CGRectMake(
     buttonbar_ = [[UIButtonBar alloc]
         initInView:overlay_
         withFrame:CGRectMake(

-            0, screenrect.size.height - 48,
-            screenrect.size.width, 48
+            0, screenrect.size.height - ButtonBarHeight_,
+            screenrect.size.width, ButtonBarHeight_

         )
         withItemList:buttonitems
     ];
         )
         withItemList:buttonitems
     ];


@@ -4073,7 +5053,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     for (int i = 0; i != 5; ++i)
         [[buttonbar_ viewWithTag:(i + 1)] setFrame:CGRectMake(
 
     for (int i = 0; i != 5; ++i)
         [[buttonbar_ viewWithTag:(i + 1)] setFrame:CGRectMake(

-            i * 64 + 2, 1, 60, 48
+            i * 64 + 2, 1, 60, ButtonBarHeight_

         )];
 
     [buttonbar_ showSelectionForButton:1];
         )];
 
     [buttonbar_ showSelectionForButton:1];


@@ -4081,30 +5061,56 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     [UIKeyboard initImplementationNow];
     CGSize keysize = [UIKeyboard defaultSize];
 
     [UIKeyboard initImplementationNow];
     CGSize keysize = [UIKeyboard defaultSize];

-    CGRect keyrect = {{0, [overlay_ bounds].size.height - keysize.height}, keysize};
+    CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize};

     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
     [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
     [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];

+    [overlay_ addSubview:keyboard_];

 
 

-    [self reloadData];
-    [book_ update];
+    install_ = [[InstallView alloc] initWithBook:book_ database:database_];
+    changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
+    manage_ = [[ManageView alloc] initWithBook:book_ database:database_];
+    search_ = [[SearchView alloc] initWithBook:book_ database:database_];

 
     [progress_ resetView];
 
     [progress_ resetView];

+    [self reloadData];

 
     if (bootstrap_)
         [self bootstrap];
     else
 
     if (bootstrap_)
         [self bootstrap];
     else

-        [self _setNewsPage];
+        [self _setHomePage];

 }
 
 - (void) showKeyboard:(BOOL)show {
 }
 
 - (void) showKeyboard:(BOOL)show {

-    if (show)
-        [overlay_ addSubview:keyboard_];
-    else
-        [keyboard_ removeFromSuperview];
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};
+    CGRect keyup = keydown;
+    keyup.origin.y -= keysize.height;
+
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:keyboard_] autorelease];
+    [animation setSignificantRectFields:2];
+
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
+        [keyboard_ activate];
+    } else {
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];
+        [keyboard_ deactivate];
+    }
+
+    [[UIAnimator sharedAnimator]
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:KeyboardTime_
+        start:YES
+    ];

 }
 
 - (void) slideUp:(UIAlertSheet *)alert {
 }
 
 - (void) slideUp:(UIAlertSheet *)alert {

-    [alert presentSheetFromButtonBar:buttonbar_];
+    if (Advanced_)
+        [alert presentSheetFromButtonBar:buttonbar_];
+    else
+        [alert presentSheetInView:overlay_];

 }
 
 @end
 }
 
 @end


@@ -4224,13 +5230,13 @@ int main(int argc, char *argv[]) {
     else
         Packages_ = [Metadata_ objectForKey:@"Packages"];
 
     else
         Packages_ = [Metadata_ objectForKey:@"Packages"];
 

-    setenv("CYDIA", "", _not(int));

     if (access("/User", F_OK) != 0)
         system("/usr/libexec/cydia/firmware.sh");
     if (access("/User", F_OK) != 0)
         system("/usr/libexec/cydia/firmware.sh");

-    system("dpkg --configure -a");

 
 

+    Locale_ = CFLocaleCopyCurrent();

     space_ = CGColorSpaceCreateDeviceRGB();
 
     space_ = CGColorSpaceCreateDeviceRGB();
 

+    Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);

     Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
     Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
     Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
     Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
     Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
     Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);


@@ -4239,6 +5245,7 @@ int main(int argc, char *argv[]) {
     int value = UIApplicationMain(argc, argv, [Cydia class]);
 
     CGColorSpaceRelease(space_);
     int value = UIApplicationMain(argc, argv, [Cydia class]);
 
     CGColorSpaceRelease(space_);

+    CFRelease(Locale_);

 
     [pool release];
     return value;
 
     [pool release];
     return value;