From e09e15893a2bf1ec77500f10a2db32eb2e4d24c6 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Tue, 8 Mar 2011 04:43:36 -0800
Subject: Merge -[Cydia {complete,{_,}reloadDataWithInvocation}].

---
 MobileCydia.mm | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 84b2e0e..f1a15ef 100644
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -8658,7 +8658,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [NSThread detachNewThreadSelector:@selector(_refreshIfPossible:) toTarget:self withObject:[Metadata_ objectForKey:@"LastUpdate"]];
 }
 
-- (void) _reloadDataWithInvocation:(NSInvocation *)invocation {
+- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
+@synchronized (self) {
     UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
     [hud setText:UCLocalize("RELOADING_DATA")];
 
@@ -8702,7 +8703,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self _updateData];
 
     [self refreshIfPossible];
-}
+} }
 
 - (void) updateData {
     [self _updateData];
@@ -8712,12 +8713,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [database_ update];
 }
 
-- (void) complete {
-    @synchronized (self) {
-        [self _reloadDataWithInvocation:nil];
-    }
-}
-
 - (void) disemulate {
     if (emulated_ == nil)
         return;
@@ -8772,6 +8767,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self performSelectorOnMainThread:@selector(repairWithInvocation:) withObject:[NSInvocation invocationWithSelector:selector forTarget:database_] waitUntilDone:YES];
 }
 
+- (void) reloadData {
+    [self reloadDataWithInvocation:nil];
+}
+
 - (void) syncData {
     [self _saveConfig];
 
@@ -8792,7 +8791,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [self detachNewProgressSelector:@selector(update_) toTarget:self forController:nil title:@"UPDATING_SOURCES"];
 
-    [self complete];
+    [self reloadData];
 }
 
 - (void) addTrivialSource:(NSString *)href {
@@ -8805,16 +8804,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     Changed_ = true;
 }
 
-- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
-    @synchronized (self) {
-        [self _reloadDataWithInvocation:invocation];
-    }
-}
-
-- (void) reloadData {
-    [self reloadDataWithInvocation:nil];
-}
-
 - (void) resolve {
     pkgProblemResolver *resolver = [database_ resolver];
 
@@ -8897,7 +8886,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ++locked_;
     [self detachNewProgressSelector:@selector(perform) toTarget:database_ forController:navigation title:@"RUNNING"];
     --locked_;
-    [self complete];
+    [self reloadData];
 }
 
 - (void) showSettings {
-- 
cgit v1.2.3