Fixed some last minute isues.

diff --git a/Cydia.app/id.png b/Cydia.app/id.png
new file mode 100644 (file)
index 0000000..0ec6a5a
Binary files /dev/null and b/Cydia.app/id.png differ

diff --git a/Cydia.app/package.html b/Cydia.app/package.html
index 952256cd985ceb465c76d9fa5afc9ae3f44f7b3f..f9ec648108e4fe537a24897e240da486a13ea809 100644 (file)
--- a/Cydia.app/package.html
+++ b/Cydia.app/package.html
@@ -242,8 +242,9 @@
 
 <label class="installed">Installed Package</label>
 <fieldset class="installed">
 
 <label class="installed">Installed Package</label>
 <fieldset class="installed">

-    <div><div>
-        <label>Version</label>
+    <div>
+        <img class="icon" src="version.png"/><div>
+        <label>&nbsp;</label>

         <label id="installed"></label>
     </div></div>
 
         <label id="installed"></label>
     </div></div>
 


@@ -255,7 +256,8 @@
 
 <label>Package Details</label>
 <fieldset>
 
 <label>Package Details</label>
 <fieldset>

-    <div><div>
+    <div>
+        <img class="icon" src="id.png"/><div>

         <label>ID</label>
         <label id="id"></label>
     </div></div>
         <label>ID</label>
         <label id="id"></label>
     </div></div>

diff --git a/Cydia.app/package.js b/Cydia.app/package.js
index 09543807e80b738b945b110ad4999cbf65f455f9..3e7c9ca34375160d909c08189682fc2058932da0 100644 (file)
--- a/Cydia.app/package.js
+++ b/Cydia.app/package.js
@@ -152,7 +152,7 @@ $(function () {
         $("#files-href").href("cydia://files/" + idc);
     }
 
         $("#files-href").href("cydia://files/" + idc);
     }
 

-    space("#id", id, 238);
+    space("#id", id, 220);

 
     var section = package.section;
     if (section == null)
 
     var section = package.section;
     if (section == null)

diff --git a/Cydia.app/version.png b/Cydia.app/version.png
new file mode 100644 (file)
index 0000000..fd1eec1
Binary files /dev/null and b/Cydia.app/version.png differ

diff --git a/Cydia.mm b/Cydia.mm
index ffc58c44de0480a49aa81676b9d3964508ca4e6f..6e31c06b7c6b0b233d8f4023b712eb3bc093c30a 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -229,7 +229,7 @@ extern NSString * const kCAFilterNearest;
 
 @implementation PopTransitionView
 
 
 @implementation PopTransitionView
 

-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+- (void) transitionViewDidComplete:(UITransitionView *)view fromView:(UIView *)from toView:(UIView *)to {

     if (from != nil && to == nil)
         [self removeFromSuperview];
 }
     if (from != nil && to == nil)
         [self removeFromSuperview];
 }


@@ -1528,7 +1528,8 @@ class Progress :
     if (file_.end())
         return nil;
     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
     if (file_.end())
         return nil;
     pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);

-    return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];
+    const std::string &maintainer(parser->Maintainer());
+    return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];

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

diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m
index 61a21c9125d275c2fc731d96c4e4ac202c5b01cd..6fe74f41e323a3b26b19e80d271f7475033f8384 100644 (file)
--- a/UICaboodle/BrowserView.m
+++ b/UICaboodle/BrowserView.m
@@ -376,7 +376,6 @@
             [delegate_ openURL:url];
         else if ([name isEqualToString:@"_popup"]) {
             RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
             [delegate_ openURL:url];
         else if ([name isEqualToString:@"_popup"]) {
             RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);

-            [book setDelegate:self];

 
             RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
             if (page == nil) {
 
             RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
             if (page == nil) {


@@ -385,6 +384,9 @@
                 page = browser;
             }
 
                 page = browser;
             }
 

+            [book setDelegate:delegate_];
+            [page setDelegate:delegate_];
+

             [book setPage:page];
             [book_ pushBook:book];
         } else goto unknown;
             [book setPage:page];
             [book_ pushBook:book];
         } else goto unknown;

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index b1bbce6757cb84946ec34e69112f597030969b8a..b639958bf452e41d1d93daf65cc729a89f95a101 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -220,15 +220,19 @@
     [navitem setTitle:title];
 }
 
     [navitem setTitle:title];
 }
 

-- (NSString *) _leftButtonTitleForPage:(RVPage *)page {
-    return [page leftButtonTitle];
+- (void) _leftButtonTitle:(NSString *&)leftButtonTitle style:(UINavigationButtonStyle &)leftButtonStyle forPage:(RVPage *)page {
+    leftButtonTitle = [page leftButtonTitle];
+    leftButtonStyle = [page leftButtonStyle];

 }
 
 - (void) reloadButtonsForPage:(RVPage *)page {
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;
 }
 
 - (void) reloadButtonsForPage:(RVPage *)page {
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;

-    NSString *leftButtonTitle([self _leftButtonTitleForPage:page]);
-    UINavigationButtonStyle leftButtonStyle = [page leftButtonStyle];
+
+    NSString *leftButtonTitle;
+    UINavigationButtonStyle leftButtonStyle;
+    [self _leftButtonTitle:leftButtonTitle style:leftButtonStyle forPage:page];
+

     UINavigationButtonStyle rightButtonStyle = [page rightButtonStyle];
     //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)];
 
     UINavigationButtonStyle rightButtonStyle = [page rightButtonStyle];
     //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)];
 


@@ -262,9 +266,12 @@
 
 @implementation RVPopUpBook
 
 
 @implementation RVPopUpBook
 

-- (NSString *) _leftButtonTitleForPage:(RVPage *)page {
-    NSString *title([super _leftButtonTitleForPage:page]);
-    return (cancel_ = title == nil && [pages_ count] == 1) ? @"Cancel" : title;
+- (void) _leftButtonTitle:(NSString *&)leftButtonTitle style:(UINavigationButtonStyle &)leftButtonStyle forPage:(RVPage *)page {
+    [super _leftButtonTitle:leftButtonTitle style:leftButtonStyle forPage:page];
+    if ((cancel_ = leftButtonTitle == nil && [pages_ count] == 1)) {
+        leftButtonTitle = @"Cancel";
+        leftButtonStyle = UINavigationButtonStyleNormal;
+    }

 }
 
 - (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
 }
 
 - (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {

diff --git a/control b/control
index 5be109052212116a05c8efe745bb859a24250a01..799979316918e6e41274c91c7a962b3cc4006cb5 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.2675-38
+Version: 1.0.2676-38

 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