Added icons to sources.

diff --git a/Cydia.app/package.html b/Cydia.app/package.html
index 7c58967856aa1e96fc2f88b68c733d9d5ccbace0..0c7762e4bd0d60a87ca9f7d5b9755597fa007116 100644 (file)
--- a/Cydia.app/package.html
+++ b/Cydia.app/package.html
@@ -279,7 +279,11 @@
 
 <label class="source">Source Information</label>
 <fieldset class="source">
 
 <label class="source">Source Information</label>
 <fieldset class="source">

-    <div><label id="source-name"></label></div>
+    <div>
+        <img class="icon" id="source-src"/>
+        <label id="source-name"></label>
+    </div>
+

     <div class="source-description" id="source-description"></div>
 </fieldset>
 
     <div class="source-description" id="source-description"></div>
 </fieldset>
 

diff --git a/Cydia.app/package.js b/Cydia.app/package.js
index 1a8fc92bf8bb76272932081176e22677937c3475..3117a576416762d65bd152a31046fa2bb5129760 100644 (file)
--- a/Cydia.app/package.js
+++ b/Cydia.app/package.js
@@ -178,6 +178,9 @@ $(function () {
         $(".source").remove();
         $(".trusted").remove();
     } else {
         $(".source").remove();
         $(".trusted").remove();
     } else {

+        var host = source.host;
+
+        $("#source-src").src("cydia://source-icon/" + encodeURIComponent(host));

         $("#source-name").html(source.name);
 
         if (source.trusted)
         $("#source-name").html(source.name);
 
         if (source.trusted)

diff --git a/Cydia.mm b/Cydia.mm
index 5742a76daa84b66d1cd2c7acc281196e0eb093fa..b7622dfe7657ea5387a36799d2b2e1143a028d95 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -261,10 +261,10 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 

-#define ForRelease 0
+#define ForRelease 1

 #define ForSaurik 1 && !ForRelease
 #define RecycleWebViews 0
 #define ForSaurik 1 && !ForRelease
 #define RecycleWebViews 0

-#define AlwaysReload 0 && !ForRelease
+#define AlwaysReload 1 && !ForRelease

 
 /* Radix Sort {{{ */
 @interface NSMutableArray (Radix)
 
 /* Radix Sort {{{ */
 @interface NSMutableArray (Radix)


@@ -5636,6 +5636,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         NSData *data(UIImagePNGRepresentation(icon));
 
 
         NSData *data(UIImagePNGRepresentation(icon));
 

+        NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
+        [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+        [client URLProtocol:self didLoadData:data];
+        [client URLProtocolDidFinishLoading:self];
+    } else if ([command isEqualToString:@"source-icon"]) {
+        if (path == nil)
+            goto fail;
+        path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        NSString *source(Simplify(path));
+
+        UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sources/%@.png", App_, source]]);
+        if (icon == nil)
+            icon = [UIImage applicationImageNamed:@"unknown.png"];
+
+        NSData *data(UIImagePNGRepresentation(icon));
+

         NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
         [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
         [client URLProtocol:self didLoadData:data];
         NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
         [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
         [client URLProtocol:self didLoadData:data];