Cleaning up Cydia for launch.

3 files changed, 16 insertions, 15 deletions

diff --git a/Cydia.app/Cydia b/Cydia.app/Cydia
new file mode 100755
index 0000000..93bca91
--- /dev/null
+++ b/Cydia.app/Cydia
@@ -0,0 +1,3 @@
+#!/bin/bash
+Cydia=$(dirname "$0")
+"${Cydia}"/Cydia_ 2>>/tmp/cydia.log
diff --git a/Cydia.app/Test b/Cydia.app/Test
index ad2582e..18ca345 100755
--- a/Cydia.app/Test
+++ b/Cydia.app/Test
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-cd "$(dirname "$0")"
-scp -p saurik@carrier.saurik.com:menes/cydia/Cydia .
-chmod +s Cydia
-su -c ./Cydia mobile
+Cydia=$(dirname "$0")
+scp -p saurik@carrier.saurik.com:menes/cydia/Cydia "${Cydia}"/Cydia_
+chmod +s "${Cydia}"/Cydia_
+su -c "${Cydia}"/Cydia_ mobile
diff --git a/Cydia.mm b/Cydia.mm
index 04c0dbe..b332d06 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -697,7 +697,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @end
 
 @implementation ConfirmationView
-#include "internals.h"
 
 - (void) dealloc {
     [transition_ release];
@@ -1393,13 +1392,13 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (void) tableRowSelected:(NSNotification *)notification {
-    switch ([table_ selectedRow]) {
-        case 8:
-            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-                [[package_ maintainer] email],
-                [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
-            ]]];
-        break;
+    int row = [table_ selectedRow];
+
+    if (row == ([package_ website] == nil ? 8 : 9)) {
+        [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+            [[package_ maintainer] email],
+            [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
+        ]]];
     }
 }
 
@@ -3155,7 +3154,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 @end
 
 @implementation Cydia
-#include "internals.h"
 
 - (void) loadNews {
     NSMutableURLRequest *request = [NSMutableURLRequest
@@ -3667,8 +3665,8 @@ int main(int argc, char *argv[]) {
             IOObjectRelease(service);
         }
 
-    AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
-    AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");
+    /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
+    AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/
 
     if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
         Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];