Porting, webkit stability.

[cydia.git] / Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index 4e6d0cae250e22cbf877861e8e682f73a55228e2..e70d9f3b953abc24e4033f54aa7c7c1102b97a45 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -35,14 +35,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 

-#ifdef __OBJC2__
-    #define UITextTraits UITextInputTraits
-    #define textTraits textInputTraits
-    #define setAutoCapsType setAutocapitalizationType
-    #define setAutoCorrectionType setAutocorrectionType
-    #define setPreferredKeyboardType setKeyboardType
-#endif
-

 /* #include Directives {{{ */
 #include <objc/objc.h>
 #include <objc/runtime.h>
 /* #include Directives {{{ */
 #include <objc/objc.h>
 #include <objc/runtime.h>


@@ -50,12 +42,25 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <GraphicsServices/GraphicsServices.h>
 #include <Foundation/Foundation.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <GraphicsServices/GraphicsServices.h>
 #include <Foundation/Foundation.h>

-#include <UIKit/UIKit.h>
+

 #include <WebCore/DOMHTML.h>
 #include <WebCore/DOMHTML.h>

+#import <QuartzCore/CALayer.h>

 
 

-#import "BrowserView.h"
-#import "ResetView.h"
-#import "UICaboodle.h"
+#import <UIKit/UIKit.h>
+
+// XXX: remove
+#import <UIKit/UIActionSheet-Private.h>
+#import <UIKit/UIControl-UIControlPrivate.h>
+#import <UIKit/UIImage-UIImageDeprecated.h>
+#import <UIKit/UIImage-UIImagePrivate.h>
+#import <UIKit/UINavigationBar-Static.h>
+#import <UIKit/UIProgressHUD-Deprecated.h>
+#import <UIKit/UIToolbar-UIButtonBarPrivate.h>
+#import <UIKit/UIView-Deprecated.h>
+#import <UIKit/UIWindow-Static.h>
+
+// XXX: remove
+#import <UIKit/NSString-UIStringDrawingDeprecated.h>

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


@@ -94,8 +99,18 @@ extern "C" {
 
 #include <errno.h>
 #include <pcre.h>
 
 #include <errno.h>
 #include <pcre.h>

+
+#import "BrowserView.h"
+#import "ResetView.h"
+#import "UICaboodle.h"

 /* }}} */
 
 /* }}} */
 

+static const NSStringCompareOptions CompareOptions_ = NSCaseInsensitiveSearch | NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch;
+
+@interface WebView (Cydia)
+- (void) _setLayoutInterval:(float)interval;
+@end
+

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


@@ -104,14 +119,6 @@ extern "C" {
 - (id) initWithCGColor:(CGColorRef)color;
 @end
 
 - (id) initWithCGColor:(CGColorRef)color;
 @end
 

-@interface UIFont {
-}
-
-+ (id)systemFontOfSize:(float)fp8;
-+ (id)boldSystemFontOfSize:(float)fp8;
-- (UIFont *) fontWithSize:(CGFloat)size;
-@end
-

 @interface NSObject (iPhoneOS)
 - (CGColorRef) cgColor;
 - (CGColorRef) CGColor;
 @interface NSObject (iPhoneOS)
 - (CGColorRef) cgColor;
 - (CGColorRef) CGColor;


@@ -152,20 +159,28 @@ extern "C" {
 - (void) setIdleTimerDisabled:(char)arg0;
 @end
 
 - (void) setIdleTimerDisabled:(char)arg0;
 @end
 

-#ifdef __OBJC2__
+extern "C" int UIApplicationMain(int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName);
+
+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;
+

 typedef enum {
     kUIProgressIndicatorStyleLargeWhite = 0,
     kUIProgressIndicatorStyleMediumWhite = 1,
 typedef enum {
     kUIProgressIndicatorStyleLargeWhite = 0,
     kUIProgressIndicatorStyleMediumWhite = 1,

+    kUIProgressIndicatorStyleMediumBrown = 2,

     kUIProgressIndicatorStyleSmallWhite = 3,
     kUIProgressIndicatorStyleSmallWhite = 3,

-    kUIProgressIndicatorStyleSmallBlack = 4
-} UIProgressIndicatorStyle;
-#else
-typedef enum {
-    kUIProgressIndicatorStyleMediumWhite = 0,
-    kUIProgressIndicatorStyleSmallWhite = 2,
-    kUIProgressIndicatorStyleSmallBlack = 3
+    kUIProgressIndicatorStyleSmallBlack = 4,
+    kUIProgressIndicatorStyleTinyWhite = 5,

 } UIProgressIndicatorStyle;
 } UIProgressIndicatorStyle;

-#endif

 
 typedef enum {
     kUIControlEventMouseDown = 1 << 0,
 
 typedef enum {
     kUIControlEventMouseDown = 1 << 0,


@@ -390,48 +405,6 @@ class GSFont {
     }
 };
 /* }}} */
     }
 };
 /* }}} */

-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
-    float       _savedRightEdgeX;
-    BOOL        _sizedtofit_flag;
-}
-
-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
-@end
-
-@implementation UIRightTextLabel
-
-- (void) setFrame:(CGRect)frame {
-    [super setFrame:frame];
-    if (_sizedtofit_flag == NO) {
-        _savedRightEdgeX = frame.origin.x;
-        [self realignText];
-    }
-}
-
-- (void) setText:(NSString *)text {
-    [super setText:text];
-    [self realignText];
-}
-
-- (void) realignText {
-    CGRect oldFrame = [self frame];
-
-    _sizedtofit_flag = YES;
-    [self sizeToFit]; // shrink down size so I can right align it
-
-    CGRect newFrame = [self frame];
-
-    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
-    oldFrame.size.width = newFrame.size.width;
-    [super setFrame:oldFrame];
-    _sizedtofit_flag = NO;
-}
-
-@end
-/* }}} */

 
 extern "C" void UISetColor(CGColorRef color);
 
 
 extern "C" void UISetColor(CGColorRef color);
 


@@ -444,11 +417,12 @@ static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.appl
 static CGColor Blue_;
 static CGColor Blueish_;
 static CGColor Black_;
 static CGColor Blue_;
 static CGColor Blueish_;
 static CGColor Black_;

-static CGColor Clear_;
+static CGColor Off_;

 static CGColor Red_;
 static CGColor White_;
 static CGColor Gray_;
 
 static CGColor Red_;
 static CGColor White_;
 static CGColor Gray_;
 

+static NSString *App_;

 static NSString *Home_;
 static BOOL Sounds_Keyboard_;
 
 static NSString *Home_;
 static BOOL Sounds_Keyboard_;
 


@@ -488,6 +462,7 @@ static _transient NSString *Role_;
 static _transient NSMutableDictionary *Packages_;
 static _transient NSMutableDictionary *Sections_;
 static _transient NSMutableDictionary *Sources_;
 static _transient NSMutableDictionary *Packages_;
 static _transient NSMutableDictionary *Sections_;
 static _transient NSMutableDictionary *Sources_;

+static _transient NSMutableArray *Documents_;

 static bool Changed_;
 static NSDate *now_;
 
 static bool Changed_;
 static NSDate *now_;
 


@@ -541,7 +516,7 @@ UITextView *GetTextView(NSString *value, float left, bool html) {
         [text setText:value];
     [text setEnabled:NO];
 
         [text setText:value];
     [text setEnabled:NO];
 

-    [text setBackgroundColor:Clear_];
+    [text setBackgroundColor:[UIColor clearColor]];

 
     CGRect frame = [text frame];
     [text setFrame:frame];
 
     CGRect frame = [text frame];
     [text setFrame:frame];


@@ -600,7 +575,9 @@ bool isSectionVisible(NSString *section) {
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
 - (void) setProgressTitle:(NSString *)title;
 - (void) setProgressPercent:(float)percent;
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
 - (void) setProgressTitle:(NSString *)title;
 - (void) setProgressPercent:(float)percent;

+- (void) startProgress;

 - (void) addProgressOutput:(NSString *)output;
 - (void) addProgressOutput:(NSString *)output;

+- (bool) isCancelling:(size_t)received;

 @end
 
 @protocol ConfigurationDelegate
 @end
 
 @protocol ConfigurationDelegate


@@ -611,7 +588,7 @@ bool isSectionVisible(NSString *section) {
 @protocol CydiaDelegate
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;
 @protocol CydiaDelegate
 - (void) installPackage:(Package *)package;
 - (void) removePackage:(Package *)package;

-- (void) slideUp:(UIAlertSheet *)alert;
+- (void) slideUp:(UIActionSheet *)alert;

 - (void) distUpgrade;
 - (void) updateData;
 - (void) syncData;
 - (void) distUpgrade;
 - (void) updateData;
 - (void) syncData;


@@ -673,10 +650,11 @@ class Status :
         );
 
         [delegate_ setProgressPercent:percent];
         );
 
         [delegate_ setProgressPercent:percent];

-        return value;
+        return [delegate_ isCancelling:CurrentBytes] ? false : value;

     }
 
     virtual void Start() {
     }
 
     virtual void Start() {

+        [delegate_ startProgress];

     }
 
     virtual void Stop() {
     }
 
     virtual void Stop() {


@@ -902,7 +880,7 @@ class Progress :
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 

-    return [lhs caseInsensitiveCompare:rhs];
+    return [lhs compare:rhs options:CompareOptions_];

 }
 
 - (NSDictionary *) record {
 }
 
 - (NSDictionary *) record {


@@ -1040,8 +1018,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     NSString *name_;
     NSString *tagline_;
     NSString *icon_;
     NSString *name_;
     NSString *tagline_;
     NSString *icon_;

-    NSString *homepage_;

     NSString *depiction_;
     NSString *depiction_;

+    NSString *homepage_;

     Address *sponsor_;
     Address *author_;
     NSArray *tags_;
     Address *sponsor_;
     Address *author_;
     NSArray *tags_;


@@ -1070,6 +1048,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (BOOL) upgradableAndEssential:(BOOL)essential;
 - (BOOL) essential;
 - (BOOL) broken;
 - (BOOL) upgradableAndEssential:(BOOL)essential;
 - (BOOL) essential;
 - (BOOL) broken;

+- (BOOL) unfiltered;

 - (BOOL) visible;
 
 - (BOOL) half;
 - (BOOL) visible;
 
 - (BOOL) half;


@@ -1104,7 +1083,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (void) install;
 - (void) remove;
 
 - (void) install;
 - (void) remove;
 

-- (NSNumber *) isVisiblySearchedForBy:(NSString *)search;
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search;

 - (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
 - (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
 - (NSNumber *) isVisibleInSource:(Source *)source;
 - (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
 - (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
 - (NSNumber *) isVisibleInSource:(Source *)source;


@@ -1127,10 +1106,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [tagline_ release];
     if (icon_ != nil)
         [icon_ release];
     [tagline_ release];
     if (icon_ != nil)
         [icon_ release];

-    if (homepage_ != nil)
-        [homepage_ release];

     if (depiction_ != nil)
         [depiction_ release];
     if (depiction_ != nil)
         [depiction_ release];

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

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


@@ -1191,14 +1170,16 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             icon_ = Scour("Icon", begin, end);
             if (icon_ != nil)
                 icon_ = [icon_ retain];
             icon_ = Scour("Icon", begin, end);
             if (icon_ != nil)
                 icon_ = [icon_ retain];

+            depiction_ = Scour("Depiction", begin, end);
+            if (depiction_ != nil)
+                depiction_ = [depiction_ retain];

             homepage_ = Scour("Homepage", begin, end);
             if (homepage_ == nil)
                 homepage_ = Scour("Website", begin, end);
             homepage_ = Scour("Homepage", begin, end);
             if (homepage_ == nil)
                 homepage_ = Scour("Website", begin, end);

+            if ([homepage_ isEqualToString:depiction_])
+                homepage_ = nil;

             if (homepage_ != nil)
                 homepage_ = [homepage_ retain];
             if (homepage_ != nil)
                 homepage_ = [homepage_ retain];

-            depiction_ = Scour("Depiction", begin, end);
-            if (depiction_ != nil)
-                depiction_ = [depiction_ retain];

             NSString *sponsor = Scour("Sponsor", begin, end);
             if (sponsor != nil)
                 sponsor_ = [[Address addressWithString:sponsor] retain];
             NSString *sponsor = Scour("Sponsor", begin, end);
             if (sponsor != nil)
                 sponsor_ = [[Address addressWithString:sponsor] retain];


@@ -1330,9 +1311,13 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return [database_ cache][iterator_].InstBroken();
 }
 
     return [database_ cache][iterator_].InstBroken();
 }
 

-- (BOOL) visible {
+- (BOOL) unfiltered {

     NSString *section = [self section];
     NSString *section = [self section];

-    return [self hasSupportingRole] && (section == nil || isSectionVisible(section));
+    return section == nil || isSectionVisible(section);
+}
+
+- (BOOL) visible {
+    return [self hasSupportingRole] && [self unfiltered];

 }
 
 - (BOOL) half {
 }
 
 - (BOOL) half {


@@ -1495,7 +1480,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 

-    return [lhs caseInsensitiveCompare:rhs];
+    return [lhs compare:rhs options:CompareOptions_];

 }
 
 - (NSComparisonResult) compareBySection:(Package *)package {
 }
 
 - (NSComparisonResult) compareBySection:(Package *)package {


@@ -1507,7 +1492,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     else if (lhs != NULL && rhs == NULL)
         return NSOrderedDescending;
     else if (lhs != NULL && rhs != NULL) {
     else if (lhs != NULL && rhs == NULL)
         return NSOrderedDescending;
     else if (lhs != NULL && rhs != NULL) {

-        NSComparisonResult result = [lhs caseInsensitiveCompare:rhs];
+        NSComparisonResult result = [lhs compare:rhs options:CompareOptions_];

         if (result != NSOrderedSame)
             return result;
     }
         if (result != NSOrderedSame)
             return result;
     }


@@ -1573,9 +1558,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [database_ cache]->MarkDelete(iterator_, true);
 }
 
     [database_ cache]->MarkDelete(iterator_, true);
 }
 

-- (NSNumber *) isVisiblySearchedForBy:(NSString *)search {
+- (NSNumber *) isUnfilteredAndSearchedForBy:(NSString *)search {

     return [NSNumber numberWithBool:(
     return [NSNumber numberWithBool:(

-        [self valid] && [self visible] && [self matches:search]
+        [self unfiltered] && [self matches:search]

     )];
 }
 
     )];
 }
 


@@ -1589,7 +1574,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     NSString *section = [self section];
 
     return [NSNumber numberWithBool:(
     NSString *section = [self section];
 
     return [NSNumber numberWithBool:(

-        [self valid] && [self visible] &&
+        [self visible] &&

         [self installed] == nil && (
             name == nil ||
             section == nil && [name length] == 0 ||
         [self installed] == nil && (
             name == nil ||
             section == nil && [name length] == 0 ||


@@ -1642,7 +1627,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             return NSOrderedDescending;
     }
 
             return NSOrderedDescending;
     }
 

-    return [lhs caseInsensitiveCompare:rhs];
+    return [lhs compare:rhs options:CompareOptions_];

 }
 
 - (Section *) initWithName:(NSString *)name {
 }
 
 - (Section *) initWithName:(NSString *)name {


@@ -2114,7 +2099,22 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [fields setObject:text forKey:key];
 
     CGColor blue(space_, 0, 0, 0.4, 1);
     [fields setObject:text forKey:key];
 
     CGColor blue(space_, 0, 0, 0.4, 1);

-    [text setTextColor:blue];
+    [text setTextColor:[UIColor colorWithCGColor:blue]];
+}
+
+bool DepSubstrate(const pkgCache::VerIterator &iterator) {
+    if (!iterator.end())
+        for (pkgCache::DepIterator dep(iterator.DependsList()); !dep.end(); ++dep) {
+            if (dep->Type != pkgCache::Dep::Depends && dep->Type != pkgCache::Dep::PreDepends)
+                continue;
+            pkgCache::PkgIterator package(dep.TargetPkg());
+            if (package.end())
+                continue;
+            if (strcmp(package.Name(), "mobilesubstrate") == 0)
+                return true;
+        }
+
+    return false;

 }
 
 @protocol ConfirmationViewDelegate
 }
 
 @protocol ConfirmationViewDelegate


@@ -2130,7 +2130,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UINavigationBar *navbar_;
     UIPreferencesTable *table_;
     NSMutableDictionary *fields_;
     UINavigationBar *navbar_;
     UIPreferencesTable *table_;
     NSMutableDictionary *fields_;

-    UIAlertSheet *essential_;
+    UIActionSheet *essential_;
+    BOOL substrate_;

 }
 
 - (void) cancel;
 }
 
 - (void) cancel;


@@ -2171,8 +2172,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         case 0:
             if (essential_ != nil)
                 [essential_ popupAlertAnimated:YES];
         case 0:
             if (essential_ != nil)
                 [essential_ popupAlertAnimated:YES];

-            else
+            else {
+                if (substrate_)
+                    Finish_ = 2;

                 [delegate_ confirm];
                 [delegate_ confirm];

+            }

         break;
 
         case 1:
         break;
 
         case 1:


@@ -2181,7 +2185,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     }
 }
 
     }
 }
 

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

     NSString *context = [sheet context];
 
     if ([context isEqualToString:@"remove"])
     NSString *context = [sheet context];
 
     if ([context isEqualToString:@"remove"])


@@ -2190,6 +2194,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 [self cancel];
                 break;
             case 2:
                 [self cancel];
                 break;
             case 2:

+                if (substrate_)
+                    Finish_ = 2;

                 [delegate_ confirm];
                 break;
             default:
                 [delegate_ confirm];
                 break;
             default:


@@ -2306,6 +2312,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         bool remove(false);
 
 
         bool remove(false);
 

+        pkgDepCache::Policy *policy([database_ policy]);
+

         pkgCacheFile &cache([database_ cache]);
         NSArray *packages = [database_ packages];
         for (size_t i(0), e = [packages count]; i != e; ++i) {
         pkgCacheFile &cache([database_ cache]);
         NSArray *packages = [database_ packages];
         for (size_t i(0), e = [packages count]; i != e; ++i) {


@@ -2327,13 +2335,16 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 if ([package essential])
                     remove = true;
                 [removing addObject:name];
                 if ([package essential])
                     remove = true;
                 [removing addObject:name];

-            }
+            } else continue;
+
+            substrate_ |= DepSubstrate(policy->GetCandidateVer(iterator));
+            substrate_ |= DepSubstrate(iterator.CurrentVer());

         }
 
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {
         }
 
         if (!remove)
             essential_ = nil;
         else if (Advanced_ || true) {

-            essential_ = [[UIAlertSheet alloc]
+            essential_ = [[UIActionSheet alloc]

                 initWithTitle:@"Removing Essentials"
                 buttons:[NSArray arrayWithObjects:
                     @"Cancel Operation (Safe)",
                 initWithTitle:@"Removing Essentials"
                 buttons:[NSArray arrayWithObjects:
                     @"Cancel Operation (Safe)",


@@ -2349,7 +2360,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 #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 {
 #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]
+            essential_ = [[UIActionSheet alloc]

                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0


@@ -2370,7 +2381,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
         )];
 
             0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
         )];
 

-        [table_ setReusesTableCells:YES];

         [table_ setDataSource:self];
         [table_ reloadData];
 
         [table_ setDataSource:self];
         [table_ reloadData];
 


@@ -2446,6 +2456,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     id delegate_;
     BOOL running_;
     SHA1SumValue springlist_;
     id delegate_;
     BOOL running_;
     SHA1SumValue springlist_;

+    size_t received_;
+    NSTimeInterval last_;

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


@@ -2501,10 +2513,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 
         if (bootstrap_)
         overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 
         if (bootstrap_)

-            [overlay_ setBackgroundColor:Black_];
+            [overlay_ setBackgroundColor:[UIColor blackColor]];

         else {
             background_ = [[UIView alloc] initWithFrame:[self bounds]];
         else {
             background_ = [[UIView alloc] initWithFrame:[self bounds]];

-            [background_ setBackgroundColor:Black_];
+            [background_ setBackgroundColor:[UIColor blackColor]];

             [self addSubview:background_];
         }
 
             [self addSubview:background_];
         }
 


@@ -2540,8 +2552,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             24
         )];
 
             24
         )];
 

-        [status_ setColor:White_];
-        [status_ setBackgroundColor:Clear_];
+        [status_ setColor:[UIColor whiteColor]];
+        [status_ setBackgroundColor:[UIColor clearColor]];

 
         [status_ setCentersHorizontally:YES];
         //[status_ setFont:font];
 
         [status_ setCentersHorizontally:YES];
         //[status_ setFont:font];


@@ -2556,8 +2568,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         //[output_ setTextFont:@"Courier New"];
         [output_ setTextSize:12];
 
         //[output_ setTextFont:@"Courier New"];
         [output_ setTextSize:12];
 

-        [output_ setTextColor:White_];
-        [output_ setBackgroundColor:Clear_];
+        [output_ setTextColor:[UIColor whiteColor]];
+        [output_ setBackgroundColor:[UIColor clearColor]];

 
         [output_ setMarginTop:0];
         [output_ setAllowsRubberBanding:YES];
 
         [output_ setMarginTop:0];
         [output_ setAllowsRubberBanding:YES];


@@ -2577,9 +2589,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [close_ setStretchBackground:YES];
         [close_ setEnabled:YES];
 
         [close_ setStretchBackground:YES];
         [close_ setEnabled:YES];
 

-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        UIFont *bold = [UIFont boldSystemFontOfSize:22];

         [close_ setTitleFont:bold];
         [close_ setTitleFont:bold];

-        CFRelease(bold);

 
         [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
         [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
 
         [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
         [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];


@@ -2595,7 +2606,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [transition_ transition:6 toView:view_];
 }
 
     [transition_ transition:6 toView:view_];
 }
 

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

     NSString *context = [sheet context];
     if ([context isEqualToString:@"conffile"]) {
         FILE *input = [database_ input];
     NSString *context = [sheet context];
     if ([context isEqualToString:@"conffile"]) {
         FILE *input = [database_ input];


@@ -2621,7 +2632,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     switch (Finish_) {
         case 0:
             [delegate_ progressViewIsComplete:self];
     switch (Finish_) {
         case 0:
             [delegate_ progressViewIsComplete:self];

-           [self resetView];
+            [self resetView];

         break;
 
         case 1:
         break;
 
         case 1:


@@ -2629,7 +2640,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         break;
 
         case 2:
         break;
 
         case 2:

-            system("killall SpringBoard");
+            system("launchctl stop com.apple.SpringBoard");

         break;
 
         case 3:
         break;
 
         case 3:


@@ -2695,6 +2706,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [output_ setText:@""];
     [progress_ setProgress:0];
 
     [output_ setText:@""];
     [progress_ setProgress:0];
 

+    received_ = 0;
+    last_ = 0;//[NSDate timeIntervalSinceReferenceDate];
+

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


@@ -2728,7 +2742,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil
         detachNewThreadSelector:selector
         toTarget:database_
         withObject:nil

-        title:@"Repairing..."
+        title:@"Repairing"

     ];
 }
 
     ];
 }
 


@@ -2743,7 +2757,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
     Package *package = id == nil ? nil : [database_ packageWithName:id];
 
 - (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
     Package *package = id == nil ? nil : [database_ packageWithName:id];
 

-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+    UIActionSheet *sheet = [[[UIActionSheet alloc]

         initWithTitle:(package == nil ? @"Source Error" : [package name])
         buttons:[NSArray arrayWithObjects:@"Okay", nil]
         defaultButtonIndex:0
         initWithTitle:(package == nil ? @"Source Error" : [package name])
         buttons:[NSArray arrayWithObjects:@"Okay", nil]
         defaultButtonIndex:0


@@ -2771,6 +2785,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ];
 }
 
     ];
 }
 

+- (void) startProgress {
+    last_ = [NSDate timeIntervalSinceReferenceDate];
+}
+

 - (void) addProgressOutput:(NSString *)output {
     [self
         performSelectorOnMainThread:@selector(_addProgressOutput:)
 - (void) addProgressOutput:(NSString *)output {
     [self
         performSelectorOnMainThread:@selector(_addProgressOutput:)


@@ -2779,6 +2797,19 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ];
 }
 
     ];
 }
 

+- (bool) isCancelling:(size_t)received {
+    if (last_ != 0) {
+        NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+        if (received_ != received) {
+            received_ = received;
+            last_ = now;
+        } else if (now - last_ > 30)
+            return true;
+    }
+
+    return false;
+}
+

 - (void) _setConfigurationData:(NSString *)data {
     static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) _setConfigurationData:(NSString *)data {
     static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 


@@ -2787,7 +2818,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     NSString *ofile = conffile_r[1];
     //NSString *nfile = conffile_r[2];
 
     NSString *ofile = conffile_r[1];
     //NSString *nfile = conffile_r[2];
 

-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+    UIActionSheet *sheet = [[[UIActionSheet alloc]

         initWithTitle:@"Configuration Upgrade"
         buttons:[NSArray arrayWithObjects:
             @"Keep My Old Copy",
         initWithTitle:@"Configuration Upgrade"
         buttons:[NSArray arrayWithObjects:
             @"Keep My Old Copy",


@@ -2807,7 +2838,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) _setProgressTitle:(NSString *)title {
 }
 
 - (void) _setProgressTitle:(NSString *)title {

-    [status_ setText:[title stringByAppendingString:@"..."]];
+    [status_ setText:title];

 }
 
 - (void) _setProgressPercent:(NSNumber *)percent {
 }
 
 - (void) _setProgressPercent:(NSNumber *)percent {


@@ -2888,7 +2919,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
 
         status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
         badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
 
         status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];

-        [status_ setBackgroundColor:Clear_];
+        [status_ setBackgroundColor:[UIColor clearColor]];

         [status_ setFont:small];
 #endif
     } return self;
         [status_ setFont:small];
 #endif
     } return self;


@@ -2903,7 +2934,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     if (NSString *icon = [package icon])
         icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
     if (icon_ == nil) if (NSString *section = [package section])
     if (NSString *icon = [package icon])
         icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
     if (icon_ == nil) if (NSString *section = [package section])

-        icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sections/%@.png", Simplify(section)]];
+        icon_ = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, Simplify(section)]];

     /*if (icon_ == nil) if (NSString *icon = [source defaultIcon])
         icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/
     if (icon_ == nil)
     /*if (icon_ == nil) if (NSString *icon = [source defaultIcon])
         icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/
     if (icon_ == nil)


@@ -2947,7 +2978,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
         [status_ setText:@"Package Damaged"];
     } else if ([package half]) {
         [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
         [status_ setText:@"Package Damaged"];

-        [status_ setColor:Red_];
+        [status_ setColor:[UIColor redColor]];

     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];
     } else {
         [badge_ setImage:nil];
         [status_ setText:nil];


@@ -2961,8 +2992,18 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
 }
 
 - (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {

-    if (icon_ != nil)
-        [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
+    if (icon_ != nil) {
+        CGRect rect;
+        rect.size = [icon_ size];
+
+        rect.size.width /= 2;
+        rect.size.height /= 2;
+
+        rect.origin.x = 25 - rect.size.width / 2;
+        rect.origin.y = 25 - rect.size.height / 2;
+
+        [icon_ drawInRect:rect];
+    }

 
     if (selected)
         UISetColor(White_);
 
     if (selected)
         UISetColor(White_);


@@ -2998,7 +3039,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     NSString *name_;
     NSString *count_;
     UIImage *icon_;
     NSString *name_;
     NSString *count_;
     UIImage *icon_;

-    UISwitchControl *switch_;
+    _UISwitchSlider *switch_;

     BOOL editing_;
 }
 
     BOOL editing_;
 }
 


@@ -3037,7 +3078,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     if ((self = [super init]) != nil) {
         icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
 
     if ((self = [super init]) != nil) {
         icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
 

-        switch_ = [[UISwitchControl alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+        switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];

         [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
     } return self;
 }
         [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
     } return self;
 }


@@ -3138,9 +3179,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil) {
         reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
 - (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);
+        UIFont *font = [UIFont systemFontOfSize:16];

         [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
         [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];

-        CFRelease(font);

     }
     [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
     return reusing;
     }
     [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
     return reusing;


@@ -3278,7 +3318,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     else _assert(false);
 }
 
     else _assert(false);
 }
 

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

     int count = [buttons_ count];
     _assert(count != 0);
     _assert(button <= count + 1);
     int count = [buttons_ count];
     _assert(count != 0);
     _assert(button <= count + 1);


@@ -3289,6 +3329,13 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [sheet dismiss];
 }
 
     [sheet dismiss];
 }
 

+#include "internals.h"
+
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    [[frame windowObject] evaluateWebScript:@"document.base.target = '_top'"];
+    return [super webView:sender didFinishLoadForFrame:frame];
+}
+

 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [window setValue:package_ forKey:@"package"];
 }
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [window setValue:package_ forKey:@"package"];
 }


@@ -3307,7 +3354,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [buttons addObjectsFromArray:buttons_];
         [buttons addObject:@"Cancel"];
 
         [buttons addObjectsFromArray:buttons_];
         [buttons addObject:@"Cancel"];
 

-        [delegate_ slideUp:[[[UIAlertSheet alloc]
+        [delegate_ slideUp:[[[UIActionSheet alloc]

             initWithTitle:nil
             buttons:buttons
             defaultButtonIndex:2
             initWithTitle:nil
             buttons:buttons
             defaultButtonIndex:2


@@ -3480,6 +3527,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         [self addSubview:list_];
         [self reloadData];
 
         [self addSubview:list_];
         [self reloadData];

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 


@@ -3504,7 +3554,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 performSelector:filter_ withObject:object_] boolValue])
+        if ([package valid] && [[package performSelector:filter_ withObject:object_] boolValue])

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


@@ -3634,7 +3684,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     _transient Database *database_;
     UISectionList *list_;
     NSMutableArray *sources_;
     _transient Database *database_;
     UISectionList *list_;
     NSMutableArray *sources_;

-    UIAlertSheet *alert_;
+    UIActionSheet *alert_;

     int offset_;
 
     NSString *href_;
     int offset_;
 
     NSString *href_;


@@ -3799,7 +3849,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
             [delegate_ syncData];
         } else if (error_ != nil) {
 
             [delegate_ syncData];
         } else if (error_ != nil) {

-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            UIActionSheet *sheet = [[[UIActionSheet alloc]

                 initWithTitle:@"Verification Error"
                 buttons:[NSArray arrayWithObjects:@"OK", nil]
                 defaultButtonIndex:0
                 initWithTitle:@"Verification Error"
                 buttons:[NSArray arrayWithObjects:@"OK", nil]
                 defaultButtonIndex:0


@@ -3810,7 +3860,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             [sheet setBodyText:[error_ localizedDescription]];
             [sheet popupAlertAnimated:YES];
         } else {
             [sheet setBodyText:[error_ localizedDescription]];
             [sheet popupAlertAnimated:YES];
         } else {

-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            UIActionSheet *sheet = [[[UIActionSheet alloc]

                 initWithTitle:@"Did not Find Repository"
                 buttons:[NSArray arrayWithObjects:@"OK", nil]
                 defaultButtonIndex:0
                 initWithTitle:@"Did not Find Repository"
                 buttons:[NSArray arrayWithObjects:@"OK", nil]
                 defaultButtonIndex:0


@@ -3862,7 +3912,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 
     return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
 }
 

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

     NSString *context = [sheet context];
     if ([context isEqualToString:@"source"])
         switch (button) {
     NSString *context = [sheet context];
     if ([context isEqualToString:@"source"])
         switch (button) {


@@ -3921,6 +3971,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [table setDelegate:self];
 
         [self reloadData];
         [table setDelegate:self];
 
         [self reloadData];

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 


@@ -3952,7 +4005,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         database:database_
     ] autorelease]];*/
 
         database:database_
     ] autorelease]];*/
 

-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+    UIActionSheet *sheet = [[[UIActionSheet alloc]

         initWithTitle:@"Enter Cydia/APT URL"
         buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
         defaultButtonIndex:0
         initWithTitle:@"Enter Cydia/APT URL"
         buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
         defaultButtonIndex:0


@@ -3962,10 +4015,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     [sheet addTextFieldWithValue:@"http://" label:@""];
 
 
     [sheet addTextFieldWithValue:@"http://" label:@""];
 

-    UITextTraits *traits = [[sheet textField] textTraits];
-    [traits setAutoCapsType:0];
-    [traits setPreferredKeyboardType:3];
-    [traits setAutoCorrectionType:1];
+    UITextInputTraits *traits = [[sheet textField] textInputTraits];
+    [traits setAutocapitalizationType:0];
+    [traits setKeyboardType:3];
+    [traits setAutocorrectionType:1];

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


@@ -3993,8 +4046,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
 }
 
     return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
 }
 

-- (RVUINavBarButtonStyle) rightButtonStyle {
-    return [[list_ table] isRowDeletionEnabled] ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal;
+- (UINavigationButtonStyle) rightButtonStyle {
+    return [[list_ table] isRowDeletionEnabled] ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;

 }
 
 @end
 }
 
 @end


@@ -4031,6 +4084,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         ];
 
         [self addSubview:packages_];
         ];
 
         [self addSubview:packages_];

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [packages_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 


@@ -4061,8 +4117,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
 }
 
     return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
 }
 

-- (RVUINavBarButtonStyle) rightButtonStyle {
-    return expert_ ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal;
+- (UINavigationButtonStyle) rightButtonStyle {
+    return expert_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;

 }
 
 - (void) setDelegate:(id)delegate {
 }
 
 - (void) setDelegate:(id)delegate {


@@ -4081,12 +4137,12 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 @implementation HomeView
 
 
 @implementation HomeView
 

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

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

-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+    UIActionSheet *sheet = [[[UIActionSheet alloc]

         initWithTitle:@"About Cydia Installer"
         buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0
         initWithTitle:@"About Cydia Installer"
         buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0


@@ -4145,6 +4201,41 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @end
 /* }}} */
 
 @end
 /* }}} */
 

+/* Indirect Delegate {{{ */
+@interface IndirectDelegate : NSProxy {
+    _transient id delegate_;
+}
+
+- (void) setDelegate:(id)delegate;
+- (id) initWithDelegate:(id)delegate;
+@end
+
+@implementation IndirectDelegate
+
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
+}
+
+- (id) initWithDelegate:(id)delegate {
+    delegate_ = delegate;
+    return self;
+}
+
+- (NSMethodSignature*) methodSignatureForSelector:(SEL)sel {
+    if (delegate_ != nil)
+        if (NSMethodSignature *sig = [delegate_ methodSignatureForSelector:sel])
+            return sig;
+    return nil;
+}
+
+- (void) forwardInvocation:(NSInvocation*)inv {
+    SEL sel = [inv selector];
+    if (delegate_ != nil && [delegate_ respondsToSelector:sel])
+        [inv invokeWithTarget:delegate_];
+}
+
+@end
+/* }}} */

 /* Browser Implementation {{{ */
 @implementation BrowserView
 
 /* Browser Implementation {{{ */
 @implementation BrowserView
 


@@ -4154,11 +4245,22 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [webview setResourceLoadDelegate:nil];
     [webview setUIDelegate:nil];
 
     [webview setResourceLoadDelegate:nil];
     [webview setUIDelegate:nil];
 

-    [scroller_ setDelegate:nil];

     [webview_ setDelegate:nil];
     [webview_ setDelegate:nil];

+    [webview_ setGestureDelegate:nil];

 
 

-    [scroller_ release];
+    /*WebFrame *frame = [webview mainFrame];
+    [frame loadHTMLString:@"" baseURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]];*/
+
+    //[webview_ removeFromSuperview];
+    //[Documents_ addObject:[webview_ autorelease]];

     [webview_ release];
     [webview_ release];

+
+    [indirect_ setDelegate:nil];
+    [indirect_ release];
+
+    [scroller_ setDelegate:nil];
+
+    [scroller_ release];

     [urls_ release];
     [indicator_ release];
     if (title_ != nil)
     [urls_ release];
     [indicator_ release];
     if (title_ != nil)


@@ -4220,10 +4322,39 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [book_ pushPage:page];
 }
 
     [book_ pushPage:page];
 }
 

-- (void) getSpecial:(NSString *)href {
+- (RVPage *) _pageForPackage:(NSString *)name {
+    if (Package *package = [database_ packageWithName:name]) {
+        PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+        [view setPackage:package];
+        return view;
+    } else {
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:@"Cannot Locate Package"
+            buttons:[NSArray arrayWithObjects:@"Close", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"missing"
+        ] autorelease];
+
+        [sheet setBodyText:[NSString stringWithFormat:
+            @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
+        , name]];
+
+        [sheet popupAlertAnimated:YES];
+        return nil;
+    }
+}
+
+- (BOOL) getSpecial:(NSString *)href {

     RVPage *page = nil;
 
     RVPage *page = nil;
 

-    if ([href hasPrefix:@"mailto:"])
+    if (
+        [href hasPrefix:@"http://ax.phobos.apple.com/"] ||
+        [href hasPrefix:@"http://phobos.apple.com/"] ||
+        [href hasPrefix:@"http://www.youtube.com/watch?"] ||
+        [href hasPrefix:@"mailto:"] ||
+        [href hasPrefix:@"tel:"]
+    )

         [delegate_ openURL:[NSURL URLWithString:href]];
     else if ([href isEqualToString:@"cydia://add-source"])
         page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
         [delegate_ openURL:[NSURL URLWithString:href]];
     else if ([href isEqualToString:@"cydia://add-source"])
         page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];


@@ -4239,32 +4370,16 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             [files setPackage:package];
             page = files;
         }
             [files setPackage:package];
             page = files;
         }

-    } else if ([href hasPrefix:@"apptapp://package/"]) {
-        NSString *name = [href substringFromIndex:18];
-
-        if (Package *package = [database_ packageWithName:name]) {
-            PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
-            [view setPackage:package];
-            page = view;
-        } else {
-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-                initWithTitle:@"Cannot Locate Package"
-                buttons:[NSArray arrayWithObjects:@"Close", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:@"missing"
-            ] autorelease];
-
-            [sheet setBodyText:[NSString stringWithFormat:
-                @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
-            , name]];
-
-            [sheet popupAlertAnimated:YES];
-        }
-    }
+    } else if ([href hasPrefix:@"apptapp://package/"])
+        page = [self _pageForPackage:[href substringFromIndex:18]];
+    else if ([href hasPrefix:@"cydia://package/"])
+        page = [self _pageForPackage:[href substringFromIndex:16]];
+    else if (![href hasPrefix:@"apptapp:"] && ![href hasPrefix:@"cydia:"])
+        return false;

 
     if (page != nil)
         [self pushPage:page];
 
     if (page != nil)
         [self pushPage:page];

+    return true;

 }
 
 - (void) webView:(WebView *)sender willClickElement:(id)element {
 }
 
 - (void) webView:(WebView *)sender willClickElement:(id)element {


@@ -4280,19 +4395,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [self getSpecial:href];
 }
 
     [self getSpecial:href];
 }
 

-- (BOOL) isSpecialScheme:(NSString *)scheme {
-    return
-        [scheme isEqualToString:@"apptapp"] ||
-        [scheme isEqualToString:@"cydia"] ||
-        [scheme isEqualToString:@"mailto"];
-}
-

 - (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
     NSURL *url = [request URL];
 - (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
     NSURL *url = [request URL];

-    if ([self isSpecialScheme:[url scheme]]) {
-        [self getSpecial:[url absoluteString]];
+    if ([self getSpecial:[url absoluteString]])

         return nil;
         return nil;

-    }

 
     if (!pushed_) {
         pushed_ = true;
 
     if (!pushed_) {
         pushed_ = true;


@@ -4302,10 +4408,25 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     return [self _addHeadersToRequest:request];
 }
 
     return [self _addHeadersToRequest:request];
 }
 

+- (BOOL) isSpecialScheme:(NSString *)scheme {
+    return
+        [scheme isEqualToString:@"apptapp"] ||
+        [scheme isEqualToString:@"cydia"] ||
+        [scheme isEqualToString:@"mailto"] ||
+        [scheme isEqualToString:@"tel"];
+}
+

 - (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
     if (request != nil) {
 - (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
     if (request != nil) {

-        NSString *scheme = [[request URL] scheme];
-        if ([self isSpecialScheme:scheme])
+        NSURL *url = [request URL];
+        NSString *scheme = [url scheme];
+        NSString *absolute = [url absoluteString];
+        if (
+            [self isSpecialScheme:scheme] ||
+            [absolute hasPrefix:@"http://ax.phobos.apple.com/"] ||
+            [absolute hasPrefix:@"http://phobos.apple.com/"] ||
+            [absolute hasPrefix:@"http://www.yahoo.com/watch?"]
+        )

             return nil;
     }
 
             return nil;
     }
 


@@ -4344,13 +4465,15 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         title_ = nil;
     }
 
         title_ = nil;
     }
 

-    [self setTitle:@"Loading..."];
+    [self setTitle:@"Loading"];

 
     WebView *webview = [webview_ webView];
     NSString *href = [webview mainFrameURL];
     [urls_ addObject:[NSURL URLWithString:href]];
 
 
     WebView *webview = [webview_ webView];
     NSString *href = [webview mainFrameURL];
     [urls_ addObject:[NSURL URLWithString:href]];
 

-    CGRect webrect = [scroller_ frame];
+    [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
+
+    CGRect webrect = [scroller_ bounds];

     webrect.size.height = 0;
     [webview_ setFrame:webrect];
 }
     webrect.size.height = 0;
     [webview_ setFrame:webrect];
 }


@@ -4363,10 +4486,31 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     }
 }
 
     }
 }
 

+- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame {
+    _trace();
+    return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame {
+    return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didCommitLoadForFrame:frame];
+}
+
+- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame {
+    return [webview_ webView:sender didReceiveDocTypeForFrame:frame];
+}
+

 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {

-    if ([frame parentFrame] != nil)
-        return;
-    [self _finishLoading];
+    if ([frame parentFrame] == nil)
+        [self _finishLoading];
+    return [webview_ webView:sender didFinishLoadForFrame:frame];

 }
 
 - (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {


@@ -4404,17 +4548,40 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         CGRect webrect = [scroller_ bounds];
         webrect.size.height = 0;
 
         CGRect webrect = [scroller_ bounds];
         webrect.size.height = 0;
 

-        webview_ = [[UIWebView alloc] initWithFrame:webrect];
-        [scroller_ addSubview:webview_];
+        webview_ = [Documents_ lastObject];
+        if (webview_ != nil) {
+            webview_ = [webview_ retain];
+            [Documents_ removeLastObject];
+            [webview_ setFrame:webrect];
+        } else {
+            webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect];
+
+            [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
+
+            [webview_ setTilingEnabled:YES];
+            [webview_ setTileMinificationFilter:kCAFilterNearest];
+            [webview_ setAutoresizes:YES];
+
+            [webview_ setViewportSize:CGSizeMake(980, -1) forDocumentTypes:0x10];
+            [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x2];
+            [webview_ setViewportSize:CGSizeMake(320, -1) forDocumentTypes:0x8];
+
+            [webview_ _setDocumentType:0x4];
+
+            [webview_ setZoomsFocusedFormControl:YES];
+            [webview_ setContentsPosition:7];
+            [webview_ setEnabledGestures:0xa];
+            [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x4];
+            [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:0x7];
+            [webview_ setSmoothsFonts:YES];
+        }

 
 

-        [webview_ setTilingEnabled:YES];
-        [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
-        [webview_ setAutoresizes:YES];

         [webview_ setDelegate:self];
         [webview_ setDelegate:self];

-        //[webview_ setEnabledGestures:2];
+        [webview_ setGestureDelegate:self];
+        [scroller_ addSubview:webview_];

 
         CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
 
         CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];

-        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)];

         [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
 
         Package *package([database_ packageWithName:@"cydia"]);
         [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
 
         Package *package([database_ packageWithName:@"cydia"]);


@@ -4423,16 +4590,28 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
             [package installed]
         ];
 
             [package installed]
         ];
 

+        indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
+

         WebView *webview = [webview_ webView];
         [webview setApplicationNameForUserAgent:application];
         [webview setFrameLoadDelegate:self];
         WebView *webview = [webview_ webView];
         [webview setApplicationNameForUserAgent:application];
         [webview setFrameLoadDelegate:self];

-        [webview setResourceLoadDelegate:self];
+        [webview setResourceLoadDelegate:indirect_];

         [webview setUIDelegate:self];
 
         [webview setUIDelegate:self];
 

+        //[webview _setLayoutInterval:0.5];
+

         urls_ = [[NSMutableArray alloc] initWithCapacity:16];
         urls_ = [[NSMutableArray alloc] initWithCapacity:16];

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [pinstripe setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 

+- (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
+    [webview_ redrawScaledDocument];
+}
+

 - (void) _rightButtonClicked {
     reloading_ = true;
     [self reloadURL];
 - (void) _rightButtonClicked {
     reloading_ = true;
     [self reloadURL];


@@ -4455,10 +4634,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) setPageActive:(BOOL)active {
 }
 
 - (void) setPageActive:(BOOL)active {

-    if (active)
-        [book_ addSubview:indicator_];
-    else
+    if (!active)

         [indicator_ removeFromSuperview];
         [indicator_ removeFromSuperview];

+    else
+        [[book_ navigationBar] addSubview:indicator_];

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


@@ -4475,11 +4654,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ProgressDelegate
 > {
     _transient Database *database_;
     ProgressDelegate
 > {
     _transient Database *database_;

-    UIView *overlay_;
+    UINavigationBar *overlay_;

     UIProgressIndicator *indicator_;
     UITextLabel *prompt_;
     UIProgressBar *progress_;
     UIProgressIndicator *indicator_;
     UITextLabel *prompt_;
     UIProgressBar *progress_;

+    UINavigationButton *cancel_;

     bool updating_;
     bool updating_;

+    size_t received_;
+    NSTimeInterval last_;

 }
 
 - (id) initWithFrame:(CGRect)frame database:(Database *)database;
 }
 
 - (id) initWithFrame:(CGRect)frame database:(Database *)database;


@@ -4609,6 +4791,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [list_ setReusesTableCells:YES];
 
         [self reloadData];
         [list_ setReusesTableCells:YES];
 
         [self reloadData];

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 


@@ -4692,6 +4877,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
 }
 
     return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
 }
 

+- (UINavigationButtonStyle) rightButtonStyle {
+    return editing_ ? UINavigationButtonStyleHighlighted : UINavigationButtonStyleNormal;
+}
+

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


@@ -4802,6 +4991,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [table setReusesTableCells:YES];
 
         [self reloadData];
         [table setReusesTableCells:YES];
 
         [self reloadData];

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 


@@ -5040,13 +5232,13 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
         CGColor dimmed(space_, 0, 0, 0, 0.5);
 
         dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
         CGColor dimmed(space_, 0, 0, 0, 0.5);

-        [dimmed_ setBackgroundColor:dimmed];
+        [dimmed_ setBackgroundColor:[UIColor colorWithCGColor:dimmed]];

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

-            filter:@selector(isVisiblySearchedForBy:)
+            filter:@selector(isUnfilteredAndSearchedForBy:)

             with:nil
         ];
 
             with:nil
         ];
 


@@ -5061,7 +5253,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         CGRect area;
         area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;
 
         CGRect area;
         area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;

-        area.origin.y = 30;
+        area.origin.y = 1;

 
         area.size.width =
 #ifdef __OBJC2__
 
         area.size.width =
 #ifdef __OBJC2__


@@ -5073,29 +5265,20 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         field_ = [[UISearchField alloc] initWithFrame:area];
 
 
         field_ = [[UISearchField alloc] initWithFrame:area];
 

-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        UIFont *font = [UIFont systemFontOfSize:16];

         [field_ setFont:font];
         [field_ setFont:font];

-        CFRelease(font);

 
         [field_ setPlaceholder:@"Package Names & Descriptions"];
         [field_ setDelegate:self];
 
 
         [field_ setPlaceholder:@"Package Names & Descriptions"];
         [field_ setDelegate:self];
 

-#ifdef __OBJC2__

         [field_ setPaddingTop:3];
         [field_ setPaddingTop:3];

-#else
-        [field_ setPaddingTop:5];
-#endif

 
 

-        UITextTraits *traits = [field_ textTraits];
-        [traits setAutoCapsType:0];
-        [traits setAutoCorrectionType:1];
+        UITextInputTraits *traits = [field_ textInputTraits];
+        [traits setAutocapitalizationType:0];
+        [traits setAutocorrectionType:1];

         [traits setReturnKeyType:6];
 
         [traits setReturnKeyType:6];
 

-#ifndef __OBJC2__
-        [traits setEditingDelegate:self];
-#endif
-
-        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
+        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height}};

 
         accessory_ = [[UIView alloc] initWithFrame:accrect];
         [accessory_ addSubview:field_];
 
         accessory_ = [[UIView alloc] initWithFrame:accrect];
         [accessory_ addSubview:field_];


@@ -5105,6 +5288,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
         [configure addTarget:self action:@selector(configurePushed) forEvents:1];
         [accessory_ addSubview:configure];*/
         [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
         [configure addTarget:self action:@selector(configurePushed) forEvents:1];
         [accessory_ addSubview:configure];*/

+
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
+        [table_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];

     } return self;
 }
 
     } return self;
 }
 


@@ -5170,6 +5356,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [indicator_ release];
     [prompt_ release];
     [progress_ release];
     [indicator_ release];
     [prompt_ release];
     [progress_ release];

+    [cancel_ release];

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


@@ -5182,13 +5369,31 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) update {
 }
 
 - (void) update {

-    [navbar_ setPrompt:@""];
-    [navbar_ addSubview:overlay_];
+    [UIView beginAnimations:nil context:NULL];
+
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = 0;
+    [overlay_ setFrame:ovrframe];
+
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y += ovrframe.size.height;
+    [navbar_ setFrame:barframe];
+
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y += ovrframe.size.height;
+    trnframe.size.height -= ovrframe.size.height;
+    [transition_ setFrame:trnframe];
+
+    [UIView endAnimations];
+

     [indicator_ startAnimation];
     [indicator_ startAnimation];

-    [prompt_ setText:@"Updating Database..."];
+    [prompt_ setText:@"Updating Database"];

     [progress_ setProgress:0];
 
     [progress_ setProgress:0];
 

+    received_ = 0;
+    last_ = [NSDate timeIntervalSinceReferenceDate];

     updating_ = true;
     updating_ = true;

+    [overlay_ addSubview:cancel_];

 
     [NSThread
         detachNewThreadSelector:@selector(_update)
 
     [NSThread
         detachNewThreadSelector:@selector(_update)


@@ -5200,11 +5405,26 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (void) _update_ {
     updating_ = false;
 
 - (void) _update_ {
     updating_ = false;
 

-    [overlay_ removeFromSuperview];

     [indicator_ stopAnimation];
     [indicator_ stopAnimation];

-    [delegate_ reloadData];

 
 

-    [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+    [UIView beginAnimations:nil context:NULL];
+
+    CGRect ovrframe = [overlay_ frame];
+    ovrframe.origin.y = -ovrframe.size.height;
+    [overlay_ setFrame:ovrframe];
+
+    CGRect barframe = [navbar_ frame];
+    barframe.origin.y -= ovrframe.size.height;
+    [navbar_ setFrame:barframe];
+
+    CGRect trnframe = [transition_ frame];
+    trnframe.origin.y -= ovrframe.size.height;
+    trnframe.size.height += ovrframe.size.height;
+    [transition_ setFrame:trnframe];
+
+    [UIView commitAnimations];
+
+    [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];

 }
 
 - (id) initWithFrame:(CGRect)frame database:(Database *)database {
 }
 
 - (id) initWithFrame:(CGRect)frame database:(Database *)database {


@@ -5212,15 +5432,19 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         database_ = database;
 
         CGRect ovrrect = [navbar_ bounds];
         database_ = database;
 
         CGRect ovrrect = [navbar_ bounds];

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

 
 

-        overlay_ = [[UIView alloc] initWithFrame:ovrrect];
+        overlay_ = [[UINavigationBar alloc] initWithFrame:ovrrect];
+        [self addSubview:overlay_];

 
 

-        bool ugly = [navbar_ _barStyle:NO] == 0;
+        [overlay_ setBarStyle:1];
+        int barstyle = [overlay_ _barStyle:NO];
+        bool ugly = barstyle == 0;

 
         UIProgressIndicatorStyle style = ugly ?
 
         UIProgressIndicatorStyle style = ugly ?

-            kUIProgressIndicatorStyleSmallBlack :
-            kUIProgressIndicatorStyleSmallWhite;
+            kUIProgressIndicatorStyleMediumBrown :
+            kUIProgressIndicatorStyleMediumWhite;

 
         CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
         unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
 
         CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
         unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;


@@ -5230,26 +5454,24 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [indicator_ setStyle:style];
         [overlay_ addSubview:indicator_];
 
         [indicator_ setStyle:style];
         [overlay_ addSubview:indicator_];
 

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

 
         CGRect prmrect = {{
             indoffset * 2 + indsize.width,
 #ifdef __OBJC2__
             -1 +
 #endif
 
         CGRect prmrect = {{
             indoffset * 2 + indsize.width,
 #ifdef __OBJC2__
             -1 +
 #endif

-            (ovrrect.size.height - prmsize.height) / 2
+            unsigned(ovrrect.size.height - prmsize.height) / 2

         }, prmsize};
 
         }, prmsize};
 

-        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
+        UIFont *font = [UIFont systemFontOfSize:15];

 
         prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 
 
         prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 

-        [prompt_ setColor:(ugly ? Blueish_ : White_)];
-        [prompt_ setBackgroundColor:Clear_];
+        [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
+        [prompt_ setBackgroundColor:[UIColor clearColor]];

         [prompt_ setFont:font];
 
         [prompt_ setFont:font];
 

-        CFRelease(font);
-

         [overlay_ addSubview:prompt_];
 
         CGSize prgsize = {75, 100};
         [overlay_ addSubview:prompt_];
 
         CGSize prgsize = {75, 100};


@@ -5262,9 +5484,25 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
         [progress_ setStyle:0];
         [overlay_ addSubview:progress_];
         progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
         [progress_ setStyle:0];
         [overlay_ addSubview:progress_];

+
+        cancel_ = [[UINavigationButton alloc] initWithTitle:@"Cancel" style:UINavigationButtonStyleHighlighted];
+        [cancel_ addTarget:self action:@selector(_onCancel) forControlEvents:UIControlEventTouchUpInside];
+
+        CGRect frame = [cancel_ frame];
+        frame.size.width = 65;
+        frame.origin.x = ovrrect.size.width - frame.size.width - 5;
+        frame.origin.y = (ovrrect.size.height - frame.size.height) / 2;
+        [cancel_ setFrame:frame];
+
+        [cancel_ setBarStyle:barstyle];

     } return self;
 }
 
     } return self;
 }
 

+- (void) _onCancel {
+    updating_ = false;
+    [cancel_ removeFromSuperview];
+}
+

 - (void) _update {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
 - (void) _update {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 


@@ -5295,6 +5533,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) setProgressPercent:(float)percent {
 }
 
 - (void) setProgressPercent:(float)percent {

+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];
+}
+
+- (void) startProgress {

 }
 
 - (void) addProgressOutput:(NSString *)output {
 }
 
 - (void) addProgressOutput:(NSString *)output {


@@ -5305,12 +5551,26 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ];
 }
 
     ];
 }
 

-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+- (bool) isCancelling:(size_t)received {
+    NSTimeInterval now = [NSDate timeIntervalSinceReferenceDate];
+    if (received_ != received) {
+        received_ = received;
+        last_ = now;
+    } else if (now - last_ > 15)
+        return true;
+    return !updating_;
+}
+
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {

     [sheet dismiss];
 }
 
 - (void) _setProgressTitle:(NSString *)title {
     [sheet dismiss];
 }
 
 - (void) _setProgressTitle:(NSString *)title {

-    [prompt_ setText:[title stringByAppendingString:@"..."]];
+    [prompt_ setText:title];
+}
+
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];

 }
 
 - (void) _addProgressOutput:(NSString *)output {
 }
 
 - (void) _addProgressOutput:(NSString *)output {


@@ -5329,7 +5589,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UIView *underlay_;
     UIView *overlay_;
     CYBook *book_;
     UIView *underlay_;
     UIView *overlay_;
     CYBook *book_;

-    UIButtonBar *buttonbar_;
+    UIToolbar *buttonbar_;

 
     ConfirmationView *confirm_;
 
 
     ConfirmationView *confirm_;
 


@@ -5358,7 +5618,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     if ([broken_ count] != 0) {
         int count = [broken_ count];
 
     if ([broken_ count] != 0) {
         int count = [broken_ count];
 

-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        UIActionSheet *sheet = [[[UIActionSheet alloc]

             initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
             buttons:[NSArray arrayWithObjects:
                 @"Forcibly Clear",
             initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
             buttons:[NSArray arrayWithObjects:
                 @"Forcibly Clear",


@@ -5374,7 +5634,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     } else if (!Ignored_ && [essential_ count] != 0) {
         int count = [essential_ count];
 
     } else if (!Ignored_ && [essential_ count] != 0) {
         int count = [essential_ count];
 

-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        UIActionSheet *sheet = [[[UIActionSheet alloc]

             initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
             buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
             defaultButtonIndex:0
             initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
             buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
             defaultButtonIndex:0


@@ -5489,7 +5749,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         detachNewThreadSelector:@selector(update_)
         toTarget:self
         withObject:nil
         detachNewThreadSelector:@selector(update_)
         toTarget:self
         withObject:nil

-        title:@"Updating Sources..."
+        title:@"Updating Sources"

     ];
 }
 
     ];
 }
 


@@ -5523,7 +5783,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 [broken addObject:[package name]];
         }
 
                 [broken addObject:[package name]];
         }
 

-        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        UIActionSheet *sheet = [[[UIActionSheet alloc]

             initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
             buttons:[NSArray arrayWithObjects:@"Okay", nil]
             defaultButtonIndex:0
             initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
             buttons:[NSArray arrayWithObjects:@"Okay", nil]
             defaultButtonIndex:0


@@ -5577,7 +5837,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil

-        title:@"Running..."
+        title:@"Running"

     ];
 }
 
     ];
 }
 


@@ -5593,7 +5853,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         detachNewThreadSelector:@selector(bootstrap_)
         toTarget:self
         withObject:nil
         detachNewThreadSelector:@selector(bootstrap_)
         toTarget:self
         withObject:nil

-        title:@"Bootstrap Install..."
+        title:@"Bootstrap Install"

     ];
 }
 
     ];
 }
 


@@ -5680,7 +5940,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) askForSettings {
 }
 
 - (void) askForSettings {

-    UIAlertSheet *role = [[[UIAlertSheet alloc]
+    UIActionSheet *role = [[[UIActionSheet alloc]

         initWithTitle:@"Who Are You?"
         buttons:[NSArray arrayWithObjects:
             @"User (Graphical Only)",
         initWithTitle:@"Who Are You?"
         buttons:[NSArray arrayWithObjects:
             @"User (Graphical Only)",


@@ -5782,7 +6042,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         nil],
     nil];
 
         nil],
     nil];
 

-    buttonbar_ = [[UIButtonBar alloc]
+    buttonbar_ = [[UIToolbar alloc]

         initInView:overlay_
         withFrame:CGRectMake(
             0, screenrect.size.height - ButtonBarHeight_,
         initInView:overlay_
         withFrame:CGRectMake(
             0, screenrect.size.height - ButtonBarHeight_,


@@ -5834,7 +6094,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         [self _setHomePage];
 }
 
         [self _setHomePage];
 }
 

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

     NSString *context = [sheet context];
     if ([context isEqualToString:@"fixhalf"])
         switch (button) {
     NSString *context = [sheet context];
     if ([context isEqualToString:@"fixhalf"])
         switch (button) {


@@ -5982,7 +6242,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||

-        readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL
+        readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
+        readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/

     ) {
         [self setIdleTimerDisabled:YES];
 
     ) {
         [self setIdleTimerDisabled:YES];
 


@@ -6026,7 +6287,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     ];
 }
 
     ];
 }
 

-- (void) slideUp:(UIAlertSheet *)alert {
+- (void) slideUp:(UIActionSheet *)alert {

     if (Advanced_)
         [alert presentSheetFromButtonBar:buttonbar_];
     else
     if (Advanced_)
         [alert presentSheetFromButtonBar:buttonbar_];
     else


@@ -6095,6 +6356,7 @@ int main(int argc, char *argv[]) {
 
     bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
 
 
     bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
 

+    App_ = [[NSBundle mainBundle] bundlePath];

     Home_ = NSHomeDirectory();
 
     {
     Home_ = NSHomeDirectory();
 
     {


@@ -6178,6 +6440,8 @@ int main(int argc, char *argv[]) {
         [Metadata_ setObject:Sources_ forKey:@"Sources"];
     }
 
         [Metadata_ setObject:Sources_ forKey:@"Sources"];
     }
 

+    Documents_ = [[[NSMutableArray alloc] initWithCapacity:4] autorelease];
+

     if (access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
         dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);
 
     if (access("/Library/MobileSubstrate/MobileSubstrate.dylib", F_OK) == 0)
         dlopen("/Library/MobileSubstrate/MobileSubstrate.dylib", RTLD_LAZY | RTLD_GLOBAL);
 


@@ -6190,7 +6454,7 @@ int main(int argc, char *argv[]) {
     Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
     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);
     Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
     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);
+    Off_.Set(space_, 0.9, 0.9, 0.9, 1.0);

     Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
     White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
     Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
     Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
     White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
     Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);


@@ -6199,7 +6463,7 @@ int main(int argc, char *argv[]) {
 
     SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
 
 
     SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
 

-    int value = UIApplicationMain(argc, argv, [Cydia class]);
+    int value = UIApplicationMain(argc, argv, @"Cydia", @"Cydia");

 
     CGColorSpaceRelease(space_);
     CFRelease(Locale_);
 
     CGColorSpaceRelease(space_);
     CFRelease(Locale_);