Instead of using sbdidlaunch, let's just spin on gssc.

[cydia.git] / MobileCydia.mm

diff --git a/MobileCydia.mm b/MobileCydia.mm
index cb5df28d6a767316039b4f94c60d68951de2f30f..7f05319193ea06cb4d7c989b294fdd73d55807d4 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -118,8 +118,6 @@ extern "C" {
 #include <errno.h>
 #include <pcre.h>
 
 #include <errno.h>
 #include <pcre.h>
 

-#include <ext/hash_map>
-

 #include "UICaboodle/BrowserView.h"
 
 #include "substrate.h"
 #include "UICaboodle/BrowserView.h"
 
 #include "substrate.h"


@@ -953,6 +951,11 @@ class CYColor {
   private:
     CGColorRef color_;
 
   private:
     CGColorRef color_;
 

+    static CGColorRef Create_(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
+        CGFloat color[] = {red, green, blue, alpha};
+        return CGColorCreate(space, color);
+    }
+

   public:
     CYColor() :
         color_(NULL)
   public:
     CYColor() :
         color_(NULL)


@@ -960,7 +963,7 @@ class CYColor {
     }
 
     CYColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) :
     }
 
     CYColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) :

-        color_(NULL)
+        color_(Create_(space, red, green, blue, alpha))

     {
         Set(space, red, green, blue, alpha);
     }
     {
         Set(space, red, green, blue, alpha);
     }


@@ -976,8 +979,7 @@ class CYColor {
 
     void Set(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
         Clear();
 
     void Set(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
         Clear();

-        float color[] = {red, green, blue, alpha};
-        color_ = CGColorCreate(space, (CGFloat *) color);
+        color_ = Create_(space, red, green, blue, alpha);

     }
 
     operator CGColorRef() {
     }
 
     operator CGColorRef() {


@@ -1362,8 +1364,6 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 - (bool) upgrade;
 - (void) update;
 
 - (bool) upgrade;
 - (void) update;
 

-- (void) setVisible;
-

 - (void) updateWithStatus:(Status &)status;
 
 - (void) setDelegate:(id)delegate;
 - (void) updateWithStatus:(Status &)status;
 
 - (void) setDelegate:(id)delegate;


@@ -1708,7 +1708,6 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
     CYString section_;
     _transient NSString *section$_;
     bool essential_;
     CYString section_;
     _transient NSString *section$_;
     bool essential_;

-    bool visible_;

     bool obsolete_;
 
     NSString *latest_;
     bool obsolete_;
 
     NSString *latest_;


@@ -1780,8 +1779,6 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 - (BOOL) hasMode;
 - (NSString *) mode;
 
 - (BOOL) hasMode;
 - (NSString *) mode;
 

-- (void) setVisible;
-

 - (NSString *) id;
 - (NSString *) name;
 - (UIImage *) icon;
 - (NSString *) id;
 - (NSString *) name;
 - (UIImage *) icon;


@@ -1810,14 +1807,12 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 
 - (uint32_t) compareBySection:(NSArray *)sections;
 
 
 - (uint32_t) compareBySection:(NSArray *)sections;
 

-- (uint32_t) compareForChanges;
-

 - (void) install;
 - (void) remove;
 
 - (bool) isUnfilteredAndSearchedForBy:(NSString *)search;
 - (bool) isUnfilteredAndSelectedForBy:(NSString *)search;
 - (void) install;
 - (void) remove;
 
 - (bool) isUnfilteredAndSearchedForBy:(NSString *)search;
 - (bool) isUnfilteredAndSelectedForBy:(NSString *)search;

-- (bool) isInstalledAndVisible:(NSNumber *)number;
+- (bool) isInstalledAndUnfiltered:(NSNumber *)number;

 - (bool) isVisibleInSection:(NSString *)section;
 - (bool) isVisibleInSource:(Source *)source;
 
 - (bool) isVisibleInSection:(NSString *)section;
 - (bool) isVisibleInSource:(Source *)source;
 


@@ -2068,10 +2063,6 @@ struct PackageNameOrdering :
     _end
 }
 
     _end
 }
 

-- (void) setVisible {
-    visible_ = [self unfiltered];
-}
-

 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
     if ((self = [super init]) != nil) {
     _profile(Package$initWithVersion)
 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
     if ((self = [super init]) != nil) {
     _profile(Package$initWithVersion)


@@ -2187,10 +2178,6 @@ struct PackageNameOrdering :
             obsolete_ = [self hasTag:@"cydia::obsolete"];
             essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
         _end
             obsolete_ = [self hasTag:@"cydia::obsolete"];
             essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
         _end

-
-        _profile(Package$initWithVersion$setVisible)
-            [self setVisible];
-        _end

     _end } return self;
 }
 
     _end } return self;
 }
 


@@ -2221,17 +2208,11 @@ struct PackageNameOrdering :
         if (section_.empty())
             return nil;
 
         if (section_.empty())
             return nil;
 

-        std::replace(section_.data(), section_.data() + section_.size(), '_', ' ');
-        NSString *name(section_);
-
-      lookup:
-        if (NSDictionary *value = [SectionMap_ objectForKey:name])
-            if (NSString *rename = [value objectForKey:@"Rename"]) {
-                name = rename;
-                goto lookup;
-            }
-
-        section$_ = name;
+        _profile(Package$section)
+            std::replace(section_.data(), section_.data() + section_.size(), '_', ' ');
+            NSString *name(section_);
+            section$_ = [SectionMap_ objectForKey:name] ?: name;
+        _end

     } return section$_;
 }
 
     } return section$_;
 }
 


@@ -2355,9 +2336,9 @@ struct PackageNameOrdering :
     _profile(Package$upgradableAndEssential)
         pkgCache::VerIterator current(iterator_.CurrentVer());
         if (current.end())
     _profile(Package$upgradableAndEssential)
         pkgCache::VerIterator current(iterator_.CurrentVer());
         if (current.end())

-            return essential && essential_ && visible_;
+            return essential && essential_;

         else
         else

-            return !version_.end() && version_ != current;// && (!essential || ![database_ cache][iterator_].Keep());
+            return !version_.end() && version_ != current;

     _end
 }
 
     _end
 }
 


@@ -2380,13 +2361,16 @@ struct PackageNameOrdering :
             return false;
     _end
 
             return false;
     _end
 

-    NSString *section;
+    return true;
+}
+
+- (BOOL) visible {
+    if (![self unfiltered])
+        return false;

 
 

-    _profile(Package$unfiltered$section)
-        section = [self section];
-    _end
+    NSString *section([self section]);

 
 

-    _profile(Package$unfiltered$isSectionVisible)
+    _profile(Package$visible$isSectionVisible)

         if (section != nil && !isSectionVisible(section))
             return false;
     _end
         if (section != nil && !isSectionVisible(section))
             return false;
     _end


@@ -2394,10 +2378,6 @@ struct PackageNameOrdering :
     return true;
 }
 
     return true;
 }
 

-- (BOOL) visible {
-    return visible_;
-}
-

 - (BOOL) half {
     unsigned char current(iterator_->CurrentState);
     return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
 - (BOOL) half {
     unsigned char current(iterator_->CurrentState);
     return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;


@@ -2698,33 +2678,6 @@ struct PackageNameOrdering :
     return _not(uint32_t);
 }
 
     return _not(uint32_t);
 }
 

-- (uint32_t) compareForChanges {
-    union {
-        uint32_t key;
-
-        struct {
-            uint32_t timestamp : 30;
-            uint32_t ignored : 1;
-            uint32_t upgradable : 1;
-        } bits;
-    } value;
-
-    bool upgradable([self upgradableAndEssential:YES]);
-    value.bits.upgradable = upgradable ? 1 : 0;
-
-    if (upgradable) {
-        value.bits.timestamp = 0;
-        value.bits.ignored = [self ignored] ? 0 : 1;
-        value.bits.upgradable = 1;
-    } else {
-        value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
-        value.bits.ignored = 0;
-        value.bits.upgradable = 0;
-    }
-
-    return _not(uint32_t) - value.key;
-}
-

 - (void) clear {
 @synchronized (database_) {
     pkgProblemResolver *resolver = [database_ resolver];
 - (void) clear {
 @synchronized (database_) {
     pkgProblemResolver *resolver = [database_ resolver];


@@ -2797,19 +2750,18 @@ struct PackageNameOrdering :
     _end
 }
 
     _end
 }
 

-- (bool) isInstalledAndVisible:(NSNumber *)number {
-    return ((![number boolValue] && ![role_ isEqualToString:@"cydia"]) || [self visible]) && ![self uninstalled];
+- (bool) isInstalledAndUnfiltered:(NSNumber *)number {
+    return ![self uninstalled] && (![number boolValue] && ![role_ isEqualToString:@"cydia"] || [self unfiltered]);

 }
 
 - (bool) isVisibleInSection:(NSString *)name {
 }
 
 - (bool) isVisibleInSection:(NSString *)name {

-    NSString *section = [self section];
+    NSString *section([self section]);

 
 

-    return
-        [self visible] && (
-            name == nil ||
-            section == nil && [name length] == 0 ||
-            [name isEqualToString:section]
-        );
+    return (
+        name == nil ||
+        section == nil && [name length] == 0 ||
+        [name isEqualToString:section]
+    ) && [self visible];

 }
 
 - (bool) isVisibleInSource:(Source *)source {
 }
 
 - (bool) isVisibleInSource:(Source *)source {


@@ -2938,6 +2890,7 @@ struct PackageNameOrdering :
 /* }}} */
 
 static NSString *Colon_;
 /* }}} */
 
 static NSString *Colon_;

+static NSString *Elision_;

 static NSString *Error_;
 static NSString *Warning_;
 
 static NSString *Error_;
 static NSString *Warning_;
 


@@ -3555,11 +3508,6 @@ static NSString *Warning_;
     [self updateWithStatus:status_];
 }
 
     [self updateWithStatus:status_];
 }
 

-- (void) setVisible {
-    for (Package *package in [self packages])
-        [package setVisible];
-}
-

 - (void) updateWithStatus:(Status &)status {
     _transient NSObject<ProgressDelegate> *delegate(status.getDelegate());
     NSString *title(UCLocalize("REFRESHING_DATA"));
 - (void) updateWithStatus:(Status &)status {
     _transient NSObject<ProgressDelegate> *delegate(status.getDelegate());
     NSString *title(UCLocalize("REFRESHING_DATA"));


@@ -4602,9 +4550,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 
 @implementation ContentView
 @end
 
 @implementation ContentView

+

 - (id) initWithFrame:(CGRect)frame {
     if ((self = [super initWithFrame:frame]) != nil) {
 - (id) initWithFrame:(CGRect)frame {
     if ((self = [super initWithFrame:frame]) != nil) {

-        /* Fix landscape stretching. */

         [self setNeedsDisplayOnBoundsChange:YES];
     } return self;
 }
         [self setNeedsDisplayOnBoundsChange:YES];
     } return self;
 }


@@ -4617,10 +4565,47 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [super drawRect:rect];
     [delegate_ drawContentRect:rect];
 }
     [super drawRect:rect];
     [delegate_ drawContentRect:rect];
 }

+
+@end
+/* }}} */
+/* Cydia TableView Cell {{{ */
+@interface CYTableViewCell : UITableViewCell {
+    ContentView *content_;
+    bool highlighted_;
+}
+
+@end
+
+@implementation CYTableViewCell
+
+- (void) dealloc {
+    [content_ release];
+    [super dealloc];
+}
+
+- (void) _updateHighlightColorsForView:(id)view highlighted:(BOOL)highlighted {
+    //NSLog(@"_updateHighlightColorsForView:%@ highlighted:%s [content_=%@]", view, highlighted ? "YES" : "NO", content_);
+
+    if (view == content_) {
+        //NSLog(@"_updateHighlightColorsForView:content_ highlighted:%s", highlighted ? "YES" : "NO", content_);
+        highlighted_ = highlighted;
+    }
+
+    [super _updateHighlightColorsForView:view highlighted:highlighted];
+}
+
+- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
+    //NSLog(@"setSelected:%s animated:%s", selected ? "YES" : "NO", animated ? "YES" : "NO");
+    highlighted_ = selected;
+
+    [super setSelected:selected animated:animated];
+    [content_ setNeedsDisplay];
+}
+

 @end
 /* }}} */
 /* Package Cell {{{ */
 @end
 /* }}} */
 /* Package Cell {{{ */

-@interface PackageCell : UITableViewCell <
+@interface PackageCell : CYTableViewCell <

     ContentDelegate
 > {
     UIImage *icon_;
     ContentDelegate
 > {
     UIImage *icon_;


@@ -4630,10 +4615,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     NSString *source_;
     UIImage *badge_;
     Package *package_;
     NSString *source_;
     UIImage *badge_;
     Package *package_;

-    UIColor *color_;
-    ContentView *content_;
-    BOOL faded_;
-    float fade_;

     UIImage *placard_;
 }
 
     UIImage *placard_;
 }
 


@@ -4684,15 +4665,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) dealloc {
     [self clearPackage];
 
 - (void) dealloc {
     [self clearPackage];

-    [content_ release];
-    [color_ release];

     [super dealloc];
 }
 
     [super dealloc];
 }
 

-- (float) fade {
-    return faded_ ? [self selectionPercent] : fade_;
-}
-

 - (PackageCell *) init {
     CGRect frame(CGRectMake(0, 0, 320, 74));
     if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) {
 - (PackageCell *) init {
     CGRect frame(CGRectMake(0, 0, 320, 74));
     if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) {


@@ -4705,8 +4680,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         [content_ setDelegate:self];
         [content_ setOpaque:YES];
 
         [content_ setDelegate:self];
         [content_ setOpaque:YES];

-        if ([self respondsToSelector:@selector(selectionPercent)])
-            faded_ = YES;

     } return self;
 }
 
     } return self;
 }
 


@@ -4777,7 +4750,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) drawContentRect:(CGRect)rect {
 }
 
 - (void) drawContentRect:(CGRect)rect {

-    bool selected([self isSelected]);
+    bool highlighted(highlighted_);

     float width([self bounds].size.width);
 
 #if 0
     float width([self bounds].size.width);
 
 #if 0


@@ -4808,15 +4781,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         )];
     }
 
         )];
     }
 

-    if (selected)
+    if (highlighted)

         UISetColor(White_);
 
         UISetColor(White_);
 

-    if (!selected)
+    if (!highlighted)

         UISetColor(commercial_ ? Purple_ : Black_);
     [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
     [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
 
         UISetColor(commercial_ ? Purple_ : Black_);
     [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
     [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
 

-    if (!selected)
+    if (!highlighted)

         UISetColor(commercial_ ? Purplish_ : Gray_);
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
 
         UISetColor(commercial_ ? Purplish_ : Gray_);
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
 


@@ -4824,12 +4797,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
 }
 
         [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
 }
 

-- (void) setSelected:(BOOL)selected animated:(BOOL)fade {
-    //[self _setBackgroundColor];
-    [super setSelected:selected animated:fade];
-    [content_ setNeedsDisplay];
-}
-

 + (int) heightForPackage:(Package *)package {
     return 73;
 }
 + (int) heightForPackage:(Package *)package {
     return 73;
 }


@@ -4837,7 +4804,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Section Cell {{{ */
 @end
 /* }}} */
 /* Section Cell {{{ */

-@interface SectionCell : UITableViewCell <
+@interface SectionCell : CYTableViewCell <

     ContentDelegate
 > {
     NSString *basic_;
     ContentDelegate
 > {
     NSString *basic_;


@@ -4845,7 +4812,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     NSString *name_;
     NSString *count_;
     UIImage *icon_;
     NSString *name_;
     NSString *count_;
     UIImage *icon_;

-    ContentView *content_;

     UISwitch *switch_;
     BOOL editing_;
 }
     UISwitch *switch_;
     BOOL editing_;
 }


@@ -4882,8 +4848,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self clearSection];
     [icon_ release];
     [switch_ release];
     [self clearSection];
     [icon_ release];
     [switch_ release];

-    [content_ release];
-

     [super dealloc];
 }
 
     [super dealloc];
 }
 


@@ -4960,20 +4924,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) drawContentRect:(CGRect)rect {
 }
 
 - (void) drawContentRect:(CGRect)rect {

-    BOOL selected = [self isSelected];
+    bool highlighted(highlighted_);

 
     [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
 
 
     [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
 

-    if (selected)
+    if (highlighted)

         UISetColor(White_);
 
         UISetColor(White_);
 

-    if (!selected)
-        UISetColor(Black_);
-

     float width(rect.size.width);
     if (editing_)
         width -= 87;
 
     float width(rect.size.width);
     if (editing_)
         width -= 87;
 

+    if (!highlighted)
+        UISetColor(Black_);

     [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation];
 
     CGSize size = [count_ sizeWithFont:Font14_];
     [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation];
 
     CGSize size = [count_ sizeWithFont:Font14_];


@@ -5650,14 +5613,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Source Cell {{{ */
 @end
 /* }}} */
 /* Source Cell {{{ */

-@interface SourceCell : UITableViewCell <
+@interface SourceCell : CYTableViewCell <

     ContentDelegate
 > {
     UIImage *icon_;
     NSString *origin_;
     NSString *description_;
     NSString *label_;
     ContentDelegate
 > {
     UIImage *icon_;
     NSString *origin_;
     NSString *description_;
     NSString *label_;

-    ContentView *content_;

 }
 
 - (void) setSource:(Source *)source;
 }
 
 - (void) setSource:(Source *)source;


@@ -5696,7 +5658,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
 - (void) dealloc {
     [self clearSource];
 
 - (void) dealloc {
     [self clearSource];

-    [content_ release];

     [super dealloc];
 }
 
     [super dealloc];
 }
 


@@ -5715,30 +5676,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } return self;
 }
 
     } return self;
 }
 

-- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-    [content_ setNeedsDisplay];
-}
-

 - (void) drawContentRect:(CGRect)rect {
 - (void) drawContentRect:(CGRect)rect {

-    bool selected([self isSelected]);
+    bool highlighted(highlighted_);

     float width(rect.size.width);
 
     if (icon_ != nil)
         [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
 
     float width(rect.size.width);
 
     if (icon_ != nil)
         [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
 

-    if (selected)
+    if (highlighted)

         UISetColor(White_);
 
         UISetColor(White_);
 

-    if (!selected)
+    if (!highlighted)

         UISetColor(Black_);
     [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
 
         UISetColor(Black_);
     [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
 

-    if (!selected)
+    if (!highlighted)

         UISetColor(Blue_);
     [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
 
         UISetColor(Blue_);
     [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
 

-    if (!selected)
+    if (!highlighted)

         UISetColor(Gray_);
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
 }
         UISetColor(Gray_);
     [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
 }


@@ -6224,7 +6180,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 - (NSString *) title { return UCLocalize("INSTALLED"); }
 
 - (id) initWithDatabase:(Database *)database {
 - (NSString *) title { return UCLocalize("INSTALLED"); }
 
 - (id) initWithDatabase:(Database *)database {

-    if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndVisible:) with:[NSNumber numberWithBool:YES]]) != nil) {
+    if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) {

         [self updateRoleButton];
         [self queueStatusDidChange];
     } return self;
         [self updateRoleButton];
         [self queueStatusDidChange];
     } return self;


@@ -6828,40 +6784,13 @@ freeing the view controllers on tab change */
     [sections_ removeAllObjects];
     [filtered_ removeAllObjects];
 
     [sections_ removeAllObjects];
     [filtered_ removeAllObjects];
 

-#if 0
-    typedef __gnu_cxx::hash_map<NSString *, Section *, NSStringMapHash, NSStringMapEqual> SectionMap;
-    SectionMap sections;
-    sections.resize(64);
-#else

     NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);
     NSMutableDictionary *sections([NSMutableDictionary dictionaryWithCapacity:32]);

-#endif

 
     _trace();
     for (Package *package in packages) {
         NSString *name([package section]);
         NSString *key(name == nil ? @"" : name);
 
 
     _trace();
     for (Package *package in packages) {
         NSString *name([package section]);
         NSString *key(name == nil ? @"" : name);
 

-#if 0
-        Section **section;
-
-        _profile(SectionsView$reloadData$Section)
-            section = &sections[key];
-            if (*section == nil) {
-                _profile(SectionsView$reloadData$Section$Allocate)
-                    *section = [[[Section alloc] initWithName:name localize:YES] autorelease];
-                _end
-            }
-        _end
-
-        [*section addToCount];
-
-        _profile(SectionsView$reloadData$Filter)
-            if (![package valid] || ![package visible])
-                continue;
-        _end
-
-        [*section addToRow];
-#else

         Section *section;
 
         _profile(SectionsView$reloadData$Section)
         Section *section;
 
         _profile(SectionsView$reloadData$Section)


@@ -6882,16 +6811,10 @@ freeing the view controllers on tab change */
         _end
 
         [section addToRow];
         _end
 
         [section addToRow];

-#endif

     }
     _trace();
 
     }
     _trace();
 

-#if 0
-    for (SectionMap::const_iterator i(sections.begin()), e(sections.end()); i != e; ++i)
-        [sections_ addObject:i->second];
-#else

     [sections_ addObjectsFromArray:[sections allValues]];
     [sections_ addObjectsFromArray:[sections allValues]];

-#endif

 
     [sections_ sortUsingSelector:@selector(compareByLocalized:)];
 
 
     [sections_ sortUsingSelector:@selector(compareByLocalized:)];
 


@@ -7062,10 +6985,7 @@ freeing the view controllers on tab change */
 - (void) _reloadPackages:(NSArray *)packages {
     _trace();
     for (Package *package in packages)
 - (void) _reloadPackages:(NSArray *)packages {
     _trace();
     for (Package *package in packages)

-        if (
-            [package uninstalled] && [package valid] && [package visible] ||
-            [package upgradableAndEssential:YES]
-        )
+        if ([package upgradableAndEssential:YES] || [package visible])

             CFArrayAppendValue(packages_, package);
 
     _trace();
             CFArrayAppendValue(packages_, package);
 
     _trace();


@@ -7080,10 +7000,9 @@ freeing the view controllers on tab change */
 
     [sections_ removeAllObjects];
 
 
     [sections_ removeAllObjects];
 

-#if 0
+#if 1

     UIProgressHUD *hud([delegate_ addProgressHUD]);
     UIProgressHUD *hud([delegate_ addProgressHUD]);

-    // XXX: localize
-    [hud setText:@"Loading Changes"];
+    [hud setText:UCLocalize("LOADING")];

     //NSLog(@"HUD:%@::%@", delegate_, hud);
     [self yieldToSelector:@selector(_reloadPackages:) withObject:packages];
     [delegate_ removeProgressHUD:hud];
     //NSLog(@"HUD:%@::%@", delegate_, hud);
     [self yieldToSelector:@selector(_reloadPackages:) withObject:packages];
     [delegate_ removeProgressHUD:hud];


@@ -8184,7 +8103,6 @@ static _finline void _setHomePage(Cydia *self) {
 }
 
 - (void) updateData {
 }
 
 - (void) updateData {

-    [database_ setVisible];

     [self _updateData];
 }
 
     [self _updateData];
 }
 


@@ -8794,7 +8712,7 @@ _trace();
     [label setTextColor:[UIColor blackColor]];
     [label setShadowColor:[UIColor whiteColor]];
     [label setShadowOffset:CGSizeMake(0, 1)];
     [label setTextColor:[UIColor blackColor]];
     [label setShadowColor:[UIColor whiteColor]];
     [label setShadowOffset:CGSizeMake(0, 1)];

-    [label setText:UCLocalize("LOADING_DATA")];
+    [label setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]];

     [container addSubview:label];
 
     CGSize viewsize = [[tabbar_ view] frame].size;
     [container addSubview:label];
 
     CGSize viewsize = [[tabbar_ view] frame].size;


@@ -9159,6 +9077,7 @@ int main(int argc, char *argv[]) { _pooled
     /* }}} */
 
     Colon_ = UCLocalize("COLON_DELIMITED");
     /* }}} */
 
     Colon_ = UCLocalize("COLON_DELIMITED");

+    Elision_ = UCLocalize("ELISION");

     Error_ = UCLocalize("ERROR");
     Warning_ = UCLocalize("WARNING");
 
     Error_ = UCLocalize("ERROR");
     Warning_ = UCLocalize("WARNING");