A few, minor, accumulated fixes.

diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js
index 41f7a0d17bacfc7c9e3234fe1f8883145e7c2052..5322af695abc8832d9fe71ec6508228bf79fe38f 100644 (file)
--- a/Cydia.app/confirm.js
+++ b/Cydia.app/confirm.js
@@ -43,9 +43,9 @@ $(function () {
             var type = entry[0];
             if (type == "PreDepends")
                 type = "Depends";
             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>" +
                 "<label>" + $.xml(type) + "</label>" +

-                "<labe>" + $.xml(entry[1] + " " + entry[3]) + "</label>" +
+                "<label>" + $.xml(entry[1] + " " + entry[3]) + "</label>" +

             "</div></div>");
         }
     }
             "</div></div>");
         }
     }

diff --git a/Cydia.mm b/Cydia.mm
index aba5704bb6f0dd63a8a7b2e49602988f6c780e8d..b62fc4a0e102d4a1bfc333e8ded1eb1f84f2ca7f 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -381,7 +381,7 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 

-#define ForRelease 1
+#define ForRelease 0

 #define ForSaurik (1 && !ForRelease)
 #define ShowInternals (1 && !ForRelease)
 #define IgnoreInstall (0 && !ForRelease)
 #define ForSaurik (1 && !ForRelease)
 #define ShowInternals (1 && !ForRelease)
 #define IgnoreInstall (0 && !ForRelease)


@@ -3110,11 +3110,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return @"Cancel";
 }
 
     return @"Cancel";
 }
 

+- (id) rightButtonTitle {
+    return issues_ != nil ? nil : [super rightButtonTitle];
+}
+

 - (id) _rightButtonTitle {
 #if AlwaysReload || IgnoreInstall
 - (id) _rightButtonTitle {
 #if AlwaysReload || IgnoreInstall

-    return @"Reload";
+    return [super _rightButtonTitle];

 #else
 #else

-    return issues_ == nil ? @"Confirm" : nil;
+    return @"Confirm";

 #endif
 }
 
 #endif
 }
 


@@ -5093,7 +5097,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ] autorelease];
 
     [sheet setBodyText:
     ] 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"
         "Jay Freeman (saurik)\n"
         "saurik@saurik.com\n"
         "http://www.saurik.com/\n"

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index cbb407f7efe2a355213b78f7f31c90d53eec53d0..a3e1830bf86fedb1932a1fece3bb3d4097f34478 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -81,4 +81,6 @@
 
 + (float) defaultWidth;
 
 
 + (float) defaultWidth;
 

+- (id) _rightButtonTitle;
+

 @end
 @end

diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m
index e7dd58be13b5037dc35222326db2682774c5140c..f3c1e3a6aa488e06e31102bdf0b3c72a1bbceb29 100644 (file)
--- a/UICaboodle/BrowserView.m
+++ b/UICaboodle/BrowserView.m
@@ -355,6 +355,8 @@
     if (![self _allowJavaScriptPanel])
         return;
 
     if (![self _allowJavaScriptPanel])
         return;
 

+    [self retain];
+

     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:nil
         buttons:[NSArray arrayWithObjects:@"OK", nil]
     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
         initWithTitle:nil
         buttons:[NSArray arrayWithObjects:@"OK", @"Cancel", nil]
         defaultButtonIndex:0

-        delegate:self
+        delegate:indirect_

         context:@"confirm"
     ] autorelease];
 
         context:@"confirm"
     ] autorelease];
 


@@ -571,9 +573,10 @@
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
     NSString *context([sheet context]);
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
     NSString *context([sheet context]);
 

-    if ([context isEqualToString:@"alert"])
+    if ([context isEqualToString:@"alert"]) {
+        [self autorelease];

         [sheet dismiss];
         [sheet dismiss];

-    else if ([context isEqualToString:@"confirm"]) {
+    } else if ([context isEqualToString:@"confirm"]) {

         switch (button) {
             case 1:
                 confirm_ = [NSNumber numberWithBool:YES];
         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]);
 
     /* 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_];
 
         [book setDelegate:delegate_];
         [browser setDelegate:delegate_];
 

diff --git a/control b/control
index 92b20a26a2387d4464c5512c2093100410fd8bfd..7eae62b2d7f0488512297f28581bcf1be2d5ce51 100644 (file)
--- a/control
+++ b/control
@@ -4,7 +4,7 @@ Priority: required
 Section: Packaging
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm
 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
 Replaces: com.sosiphone.addcydia
 Depends: apt, darwintools, pcre, shell-cmds
 Conflicts: com.sosiphone.addcydia