Consistent application of right and left buttons.

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index a75027837831f1faf3b97436322f32de7ecc2db8..c6033bcd4629244124fe3cc4ee34a76978c7a304 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -806,6 +806,7 @@ float CYScrollViewDecelerationRateNormal;
         [webview_ insertSubview:table atIndex:0];
 
         [self applyLeftButton];
         [webview_ insertSubview:table atIndex:0];
 
         [self applyLeftButton];

+        [self applyRightButton];

 
         [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
         [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
         [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
         [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 9eb579119d8c7e6ace8817c670bf363f43ef4a25..296e7c346f5c076ebf8a92d44c92b00f70c431a1 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -5049,13 +5049,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-- (void) updateCancel {
-    [[self navigationItem] setLeftBarButtonItem:(cancel_ == 1 ? [[[UIBarButtonItem alloc]
+- (UIBarButtonItem *) leftButton {
+    return cancel_ == 1 ? [[[UIBarButtonItem alloc]

         initWithTitle:UCLocalize("CANCEL")
         style:UIBarButtonItemStylePlain
         target:self
         action:@selector(cancel)
         initWithTitle:UCLocalize("CANCEL")
         style:UIBarButtonItemStylePlain
         target:self
         action:@selector(cancel)

-    ] autorelease] : nil)];
+    ] autorelease] : nil;
+}
+
+- (void) updateCancel {
+    [super applyLeftButton];

 }
 
 - (id) initWithDatabase:(Database *)database delegate:(id)delegate {
 }
 
 - (id) initWithDatabase:(Database *)database delegate:(id)delegate {