Ported to latest firmware and fixed locales.

[cydia.git] / UICaboodle / RVBook.mm

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index 5ac8b2ed88c66b7973e627bedd0094b28878f623..e6cc1263159508aeb2594b9281e7828931b8bc79 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -50,7 +50,7 @@
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
         [self addSubview:navbar_];
 
-        [navbar_ setBarStyle:1];
+        [navbar_ setBarStyle:0];
         [navbar_ setDelegate:self];
 
         [navbar_ setPrompt:@""];
@@ -102,7 +102,11 @@
     [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 {
@@ -145,7 +149,11 @@
     [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 {