Checkpointing a bad Cydia build (why not?).

[cydia.git] / UICaboodle / RVBook.mm

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index db1ae0a71a3ff6721871bbbf38a47f221837fedf..ccd3e426b0235d0ba9875a4c37675c36dc21f2ae 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,11 +102,10 @@
     [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
+    if ([navbar_ respondsToSelector:@selector(setAccessoryView:animate:goingBack:)])
+        [navbar_ setAccessoryView:[page accessoryView] animate:animated goingBack:NO];
+    else
+        [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO];
 }
 
 - (void) popPages:(unsigned)pages {
@@ -149,11 +148,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
+
+    if ([navbar_ respondsToSelector:@selector(setAccessoryView:animate:goingBack:)])
+        [navbar_ setAccessoryView:[page accessoryView] animate:animated goingBack:YES];
+    else
+        [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO];
 }
 
 - (void) setTitle:(NSString *)title forPage:(RVPage *)page {