Timeouts, update cancel, update /bar/, webkit stability, url throttling.

[cydia.git] / UICaboodle / RVBook.mm

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index e6cc1263159508aeb2594b9281e7828931b8bc79..9315cae91c1e14dd39418acadd963ced754b52fd 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -8,6 +8,14 @@
 #import <UIKit/UIView-Geometry.h>
 #import <UIKit/UIView-Hierarchy.h>
 
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CGGeometry.h>
+
+#include <cstdio>
+#include <cstdlib>
+
+#include <errno.h>
+
 #import "RVPage.h"
 
 @implementation RVBook
@@ -102,11 +110,7 @@
     [pages_ addObject:page];
     [self reloadButtonsForPage:page];
 
-#ifdef __OBJC2__
     [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO];
-#else
-    [navbar_ setAccessoryView:[page accessoryView] animate:animated goingBack:NO];
-#endif
 }
 
 - (void) popPages:(unsigned)pages {
@@ -149,11 +153,8 @@
     [transition_ transition:(animated ? 2 : 0) toView:page];
     [page setPageActive:YES];
     [self reloadButtonsForPage:page];
-#ifdef __OBJC2__
+
     [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO];
-#else
-    [navbar_ setAccessoryView:[page accessoryView] animate:animated goingBack:YES];
-#endif
 }
 
 - (void) setTitle:(NSString *)title forPage:(RVPage *)page {
@@ -173,8 +174,17 @@
 - (void) reloadButtonsForPage:(RVPage *)page {
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;
-    NSString *leftButtonTitle([pages_ count] == 1 ? [page leftButtonTitle] : nil);
-    [navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle]];
+    NSString *leftButtonTitle([page leftButtonTitle]);
+    RVUINavBarButtonStyle leftButtonStyle = [page leftButtonStyle];
+    RVUINavBarButtonStyle rightButtonStyle = [page rightButtonStyle];
+    //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)];
+
+    [navbar_
+        showLeftButton:leftButtonTitle
+        withStyle:leftButtonStyle
+        rightButton:[page rightButtonTitle]
+        withStyle:rightButtonStyle
+    ];
 }
 
 - (NSString *) getTitleForPage:(RVPage *)page {