diff options
| -rw-r--r-- | Cydia.app/confirm.js | 4 | ||||
| -rw-r--r-- | Cydia.mm | 12 | ||||
| -rw-r--r-- | UICaboodle/BrowserView.h | 2 | ||||
| -rw-r--r-- | UICaboodle/BrowserView.m | 11 | ||||
| -rw-r--r-- | control | 2 |
5 files changed, 20 insertions, 11 deletions
diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js index 41f7a0d..5322af6 100644 --- a/Cydia.app/confirm.js +++ b/Cydia.app/confirm.js @@ -43,9 +43,9 @@ $(function () { var type = entry[0]; if (type == "PreDepends") type = "Depends"; - $("#i" + i).append("<div><div>" + + $("#i" + i).append("<div class=\"clearfix\"><div>" + "<label>" + $.xml(type) + "</label>" + - "<labe>" + $.xml(entry[1] + " " + entry[3]) + "</label>" + + "<label>" + $.xml(entry[1] + " " + entry[3]) + "</label>" + "</div></div>"); } } @@ -381,7 +381,7 @@ extern NSString * const kCAFilterNearest; #define lprintf(args...) fprintf(stderr, args) -#define ForRelease 1 +#define ForRelease 0 #define ForSaurik (1 && !ForRelease) #define ShowInternals (1 && !ForRelease) #define IgnoreInstall (0 && !ForRelease) @@ -3110,11 +3110,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return @"Cancel"; } +- (id) rightButtonTitle { + return issues_ != nil ? nil : [super rightButtonTitle]; +} + - (id) _rightButtonTitle { #if AlwaysReload || IgnoreInstall - return @"Reload"; + return [super _rightButtonTitle]; #else - return issues_ == nil ? @"Confirm" : nil; + return @"Confirm"; #endif } @@ -5093,7 +5097,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { ] autorelease]; [sheet setBodyText: - @"Copyright (C) 2008\n" + @"Copyright (C) 2008-2009\n" "Jay Freeman (saurik)\n" "saurik@saurik.com\n" "http://www.saurik.com/\n" diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h index cbb407f..a3e1830 100644 --- a/UICaboodle/BrowserView.h +++ b/UICaboodle/BrowserView.h @@ -81,4 +81,6 @@ + (float) defaultWidth; +- (id) _rightButtonTitle; + @end diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m index e7dd58b..f3c1e3a 100644 --- a/UICaboodle/BrowserView.m +++ b/UICaboodle/BrowserView.m @@ -355,6 +355,8 @@ if (![self _allowJavaScriptPanel]) return; + [self retain]; + UIActionSheet *sheet = [[[UIActionSheet alloc] initWithTitle:nil buttons:[NSArray arrayWithObjects:@"OK", nil] @@ -375,7 +377,7 @@ initWithTitle:nil buttons:[NSArray arrayWithObjects:@"OK", @"Cancel", nil] defaultButtonIndex:0 - delegate:self + delegate:indirect_ context:@"confirm" ] autorelease]; @@ -571,9 +573,10 @@ - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { NSString *context([sheet context]); - if ([context isEqualToString:@"alert"]) + if ([context isEqualToString:@"alert"]) { + [self autorelease]; [sheet dismiss]; - else if ([context isEqualToString:@"confirm"]) { + } else if ([context isEqualToString:@"confirm"]) { switch (button) { case 1: confirm_ = [NSNumber numberWithBool:YES]; @@ -689,7 +692,7 @@ /* XXX: deal with cydia:// pages */ BrowserView *browser([[[BrowserView alloc] initWithBook:book forWidth:width] autorelease]); - if (features == nil && popup_) { + if (features != nil && popup_) { [book setDelegate:delegate_]; [browser setDelegate:delegate_]; @@ -4,7 +4,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) <saurik@saurik.com> Architecture: iphoneos-arm -Version: 1.0.2705-41 +Version: 1.0.2716-42 Replaces: com.sosiphone.addcydia Depends: apt, darwintools, pcre, shell-cmds Conflicts: com.sosiphone.addcydia |