Fix the warnings when building with AlwaysReload=0, and fix the action button for...

diff --git a/Cydia.mm b/Cydia.mm
index c28f93d945add031c8b9b7b023acda02ad0c81d9..3afab9db3e9e6b93e73337ffb98f8e2edfccda39 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1216,6 +1216,7 @@ bool isSectionVisible(NSString *section) {
 - (void) removeProgressHUD:(UIProgressHUD *)hud;
 - (UCViewController *) pageForPackage:(NSString *)name;
 - (PackageController *) packageController;
 - (void) removeProgressHUD:(UIProgressHUD *)hud;
 - (UCViewController *) pageForPackage:(NSString *)name;
 - (PackageController *) packageController;

+- (void) showActionSheet:(UIActionSheet *)sheet fromItem:(UIBarButtonItem *)item;

 @end
 /* }}} */
 
 @end
 /* }}} */
 


@@ -5121,7 +5122,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 @end
 /* }}} */
 /* Package Controller {{{ */
 @end
 /* }}} */
 /* Package Controller {{{ */

-@interface PackageController : CYBrowserController {
+@interface PackageController : CYBrowserController <
+    UIActionSheetDelegate
+> {

     _transient Database *database_;
     Package *package_;
     NSString *name_;
     _transient Database *database_;
     Package *package_;
     NSString *name_;


@@ -5193,7 +5196,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 #if !AlwaysReload
 }
 
 #if !AlwaysReload

-- (void) _actionButtonClicked {
+- (void) _customButtonClicked {

     int count([buttons_ count]);
     if (count == 0)
         return;
     int count([buttons_ count]);
     if (count == 0)
         return;


@@ -5223,10 +5226,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 }
 
     }
 }
 

-- (void) actionButtonClicked {
+- (void) customButtonClicked {

     // Wait until it's done loading.
     if (![self isLoading])
     // Wait until it's done loading.
     if (![self isLoading])

-        [self _actionButtonClicked];
+        [self _customButtonClicked];

 }
 
 - (void) reloadButtonClicked {
 }
 
 - (void) reloadButtonClicked {


@@ -5309,7 +5312,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         initWithTitle:count == 0 ? nil : count != 1 ? UCLocalize("MODIFY") : [buttons_ objectAtIndex:0]
         style:UIBarButtonItemStylePlain
         target:self
         initWithTitle:count == 0 ? nil : count != 1 ? UCLocalize("MODIFY") : [buttons_ objectAtIndex:0]
         style:UIBarButtonItemStylePlain
         target:self

-        action:@selector(actionButtonClicked)
+        action:@selector(customButtonClicked)

     ];
     if (![self isLoading]) [[self navigationItem] setRightBarButtonItem:actionItem];
     else [super applyRightButton];
     ];
     if (![self isLoading]) [[self navigationItem] setRightBarButtonItem:actionItem];
     else [super applyRightButton];

diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index 589dcf3f79e1e799a5c239a7e0741081826958bc..f9f03a4836766ad95fe1c01c673ac15a0195b83e 100644 (file)
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -54,6 +54,7 @@ typedef enum {
 
 
 @interface UIActionSheet (Apple)
 
 
 @interface UIActionSheet (Apple)

+- (void) setContext:(NSString *)context;

 - (NSString *) context;
 @end
 
 - (NSString *) context;
 @end