From b0ad8dee056b2ad8a987a47f9235076b6b3f6a19 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 9 Dec 2008 08:43:33 +0000 Subject: Fixed title bar of confirmation and finally fixed stupid memory allocation bug. --- Cydia.app/confirm.js | 2 ++ Cydia.mm | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js index 9210295..33b0014 100644 --- a/Cydia.app/confirm.js +++ b/Cydia.app/confirm.js @@ -27,6 +27,8 @@ $(function () { $("#disk-key").html(negative ? "Disk Freeing" : "Disk Using"); $("#disk-value").html($.xml(size)); } else for (var i = 0; i != issues.length; ++i) { + document.title = "Cannot Comply"; + $("._issues").remove(); var issue = issues[i]; diff --git a/Cydia.mm b/Cydia.mm index ac9df53..ad007e3 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -35,6 +35,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +// XXX: wtf/FastMalloc.h... wtf? +#define USE_SYSTEM_MALLOC 1 + /* #include Directives {{{ */ #import "UICaboodle.h" @@ -259,8 +262,9 @@ extern NSString * const kCAFilterNearest; #define ForRelease 0 #define ForSaurik (1 && !ForRelease) +#define IgnoreInstall (0 && !ForRelease) #define RecycleWebViews 0 -#define AlwaysReload (1 && !ForRelease) +#define AlwaysReload (0 && !ForRelease) /* Radix Sort {{{ */ @interface NSMutableArray (Radix) @@ -2851,7 +2855,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (id) _rightButtonTitle { +#if AlwaysReload || IgnoreInstall + return @"Reload"; +#else return issues_ == nil ? @"Confirm" : nil; +#endif } - (void) _leftButtonClicked { @@ -2860,6 +2868,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { #if !AlwaysReload - (void) _rightButtonClicked { +#if IgnoreInstall + return [super _rightButtonClicked]; +#endif if (essential_ != nil) [essential_ popupAlertAnimated:YES]; else { @@ -6991,7 +7002,8 @@ int main(int argc, char *argv[]) { _pooled Indices_ = [[NSMutableDictionary alloc] init];*/ Indices_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: - @"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/server/rating/@P", @"Rating", + //@"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/server/rating/@", @"Rating", + @"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/repotag/@", @"RepoTag", nil]; if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL) -- cgit v1.2.3