Merge branch 'master' of saurik.com:cydia

4 files changed, 20 insertions, 20 deletions

diff --git a/Cydia.app/package.js b/Cydia.app/package.js
index 6e091cf..b9f85ff 100644
--- a/Cydia.app/package.js
+++ b/Cydia.app/package.js
@@ -195,19 +195,23 @@ var special_ = function () {
     }*/
 
     var depiction = package.depiction;
-    if (depiction == null)
-        $(".depiction").addClass("deleted");
-    else {
+    if (depiction != null) {
         $(".description").addClass("deleted");
         $("#depiction-src").src(depiction);
-    }
+    } else {
+        $(".depiction").addClass("deleted");
 
-    var description = package.longDescription;
-    if (description == null)
-        description = package.shortDescription;
-    else
-        description = description.replace(/\n/g, "<br/>");
-    $("#description").html(description);
+        var description = package.longDescription;
+        if (description == null)
+            description = package.shortDescription;
+
+        if (description == null)
+            $(".description").addClass("deleted");
+        else {
+            description = $.xml(description).replace(/\n/g, "<br/>");
+            $("#description").html(description);
+        }
+    }
 
     var homepage = package.homepage;
     if (homepage == null)
@@ -279,7 +283,7 @@ var special_ = function () {
         if (description == null)
             $(".source-description").addClass("deleted");
         else
-            $("#source-description").html(description);
+            $("#source-description").html($.xml(description));
     }
 };
 
diff --git a/Cydia.mm b/Cydia.mm
index 7531f89..c64a587 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -311,7 +311,7 @@ static _finline void UpdateExternalStatus(uint64_t newStatus) {
     } return self;
 }
 
-- (void)_updateFrameForDisplay {
+- (void) _updateFrameForDisplay {
     [super _updateFrameForDisplay];
     if ([self cancelButtonIndex] == -1) {
         NSArray *buttons = [self buttons];
@@ -7821,7 +7821,7 @@ freeing the view controllers on tab change */
     [super dealloc];
 }
 
-- (id) initWithDatabase: (Database *)database {
+- (id) initWithDatabase:(Database *)database {
     if ((self = [super init]) != nil) {
         database_ = database;
 
diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index 9703227..86c7da6 100755
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -1161,7 +1161,7 @@ static Class $UIWebBrowserView;
                             UIColor *uic(nil);
 
                             if (red == 0xc7 && green == 0xce && blue == 0xd5)
-                                uic = [UIColor pinStripeColor];
+                                uic = [UIColor groupTableViewBackgroundColor];
                             else if (alpha != 0)
                                 uic = [UIColor
                                     colorWithRed:(red / 255)
@@ -1178,7 +1178,7 @@ static Class $UIWebBrowserView;
                     }
 
                     if (!colored)
-                        [scroller_ setBackgroundColor:[UIColor pinStripeColor]];
+                        [scroller_ setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
                     break;
                 }
     }
@@ -1355,7 +1355,7 @@ static Class $UIWebBrowserView;
         [[self view] addSubview:scroller_];
 
         [scroller_ setFixedBackgroundPattern:YES];
-        [scroller_ setBackgroundColor:[UIColor pinStripeColor]];
+        [scroller_ setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
 
         [scroller_ setScrollingEnabled:YES];
         [scroller_ setClipsSubviews:YES];
diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index f9f03a4..de959c9 100644
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -89,10 +89,6 @@ typedef enum {
 - (UIView *) view;
 @end
 
-@interface UIColor (Apple)
-+ (UIColor *) pinStripeColor;
-@end
-
 @interface UIControl (Apple)
 - (void) addTarget:(id)target action:(SEL)action forEvents:(NSInteger)events;
 @end