From 9ea8d15949c5f95593de8abb3dac4e09f952aa38 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Sun, 11 May 2008 04:48:26 +0000
Subject: [PATCH] Minor cleanups before release.

---
 Cydia.app/Default.png | Bin 1417 -> 1466 bytes
 Cydia.mm              |  37 ++++++++++++++++++-------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Cydia.app/Default.png b/Cydia.app/Default.png
index e83e6f300a3a66f5d7bb098a9154da8d8e954395..b603d4e28655842c259851d1fa39f24cf8cd0315 100644
GIT binary patch
literal 1466
zcmeAS@N?(olHy`uVBq!ia0y~yU~~ZDGaPI{ktL4`Ie`>oage(c!@6@aFBuqEOFUg1
zLn>~)y{qWQ94O&-alh~7y9tpDvDSPt87xc}S^O{WIjGFpcCYx&4)wf!=9dq=`}s9j
zx?#cL-^Z5+Gfeu{$8bXLK<=G}#w-SNMwUg4G2RS}+yV+>4(SXL4Gc^i7dRe7@iCrY
zyTHV<DLg?~0L)qyp1>{eg6)DL!&L??g#g|K<qZw290`m}KrQBS4nR3QhyBbz)4uQt
zaIk}vX>VX+y2<d1i>GA$0Va+V<`)7DuS9RmKg_g>@z1W9xl9wbl(RULG5+EJ86l<s
zH*Nb?23aPc!CS;0L^L>j<66_;VAc@F#B>*I-I5<%JRAxRAGqEKFmMYj*v8=NpdfYN
zqjScB-9T*@p2#WywE`8WHP|%)oeH!*<R=G6;2qZ+WsrNnh%Mmc0NS{f^##ZTg>4Lf
z1*A4GFlKRI@OC)B#L}VbupSg1K%;rV{F`_0+DkM#7&r9$>)SK!cvfL^?#!8|MY88@
zKA+hfUHgoSCxuf%0Tgf)6O@|(aRS8-ff_&+Pf;ms6dI`G8lWjuh^fKm8er<9PU4|T
z*pTj;1M_d6J@ZVWVbS52B}H7o%=Y~AO-+Wg40*Gq4Zw*p;6b_pq=*O+dk}S6lVRNf
zq#S21>=54w%(TG#3(U$a0tZATAWR(xAoqv*pX3sS)A22AECL`t$wb{l=`_g}z8wox
RWq^e-gQu&X%Q~loCIAKeGpYap

delta 441
zcmdnR-N`*crJgOx+ueoXKL{?^yL>VO0|RG)M`SSr1Gg{;GcwGYBLNg-FY)wsWxv71
z%qFU<qs_OUfq_-b)5S5Q;?~={8*>jEh`3(VcfOzz<x-uwyF|~np(;1QW6AF+ZcI0-
zo=-_U{^-#~zDbF(*W(x(kLBLJ!!$wiz_nS?3`We!74w!yGq4CaFfa-+y)brAFl#to
zxP$co6Uzp$h_}E2VF@4)sK7sgfsy3{3mb&VEdWuY<G=uBf=mFaYWUBW@cynYgP4ND
zq=l<|9272{6`j10$zieq6Wiq3Omf->o=ZNjEaP@qvT)U|Yz8Iq2j~BOeC@t=S>~!$
ztDb)@cy?yy=F{_j@(6UOHcXz#;=1_(lPVKXv*hGpCb!AlOckm1c`H`ElWK5zyh$gI
z@dVF<eeXe3!uz-b4Gc^i3Jy&B*_b05Kn^&?l(TjxE71KAr-9t}z=-jSu0aAL6IcaM
zLj@B=aRV!dLIXqmA$vFWq@UdvCVyly7e62!XZkBVMRWU%Rlpcv@O1TaS?83{1OU)c
Bm~a39

diff --git a/Cydia.mm b/Cydia.mm
index 2d94935b..9615f54f 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1464,9 +1464,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             [delegate_ repairWithSelector:@selector(configure)];
         else if (error == "The package lists or status file could not be parsed or opened.")
             [delegate_ repairWithSelector:@selector(update)];
-        else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
-            [delegate_ repairWithSelector:@selector(unlock)];
-        //else if (error == "The list of sources could not be read.")
+        // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
+        // else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
+        // else if (error == "The list of sources could not be read.")
         else _assert(false);
 
         return;
@@ -1501,10 +1501,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [packages_ sortUsingSelector:@selector(compareByName:)];
 }
 
-- (void) unlock {
-    system("killall dpkg");
-}
-
 - (void) configure {
     NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
     system([dpkg UTF8String]);
@@ -1789,7 +1785,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         CGRect bounds = [overlay_ bounds];
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [navbar_ setBarStyle:1];
+        if (Advanced_)
+            [navbar_ setBarStyle:1];
         [navbar_ setDelegate:self];
 
         UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
@@ -2553,16 +2550,18 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         package_ = [package retain];
         name_ = [[package id] retain];
 
-        NSString *list = [NSString
-            stringWithContentsOfFile:[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_]
-            encoding:kCFStringEncodingUTF8
-            error:NULL
-        ];
+        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
+
+        {
+            std::ifstream fin([path UTF8String]);
+            std::string line;
+            while (std::getline(fin, line))
+                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
+        }
 
-        if (list != nil) {
-            [files_ addObjectsFromArray:[list componentsSeparatedByString:@"\n"]];
-            [files_ removeLastObject];
-            [files_ removeObjectAtIndex:0];
+        if ([files_ count] != 0) {
+            if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
+                [files_ removeObjectAtIndex:0];
             [files_ sortUsingSelector:@selector(compareByPath:)];
 
             NSMutableArray *stack = [NSMutableArray arrayWithCapacity:8];
@@ -2842,7 +2841,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [buttons addObject:@"Cancel"];
 
         [delegate_ slideUp:[[[UIAlertSheet alloc]
-            initWithTitle:@"Manage Package"
+            initWithTitle:nil
             buttons:buttons
             defaultButtonIndex:2
             delegate:self
@@ -4655,7 +4654,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (void) slideUp:(UIAlertSheet *)alert {
-    [alert presentSheetFromButtonBar:buttonbar_];
+    [alert presentSheetInView:overlay_];
 }
 
 @end
-- 
2.47.2