From: Jay Freeman (saurik) <saurik@saurk.com>
Date: Tue, 14 Oct 2008 09:14:53 +0000 (+0000)
Subject: Support libraries for recent Cydia changes.
X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/5fd870e094f91c77bdcca3d9cb0b3ca512eee634?hp=56e1090818a4e0f5af9e79ce67c2cba5a0842f95

Support libraries for recent Cydia changes.
---

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 48dac915..0f35cb7b 100644
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -15,7 +15,6 @@
 @class IndirectDelegate;
 
 @interface BrowserView : RVPage {
-    _transient Database *database_;
     UIScroller *scroller_;
     UIWebDocumentView *webview_;
     NSMutableArray *urls_;
@@ -37,7 +36,7 @@
 
 - (WebView *) webView;
 
-- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (id) initWithBook:(RVBook *)book;
 
 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame;
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
diff --git a/UICaboodle/RVBook.h b/UICaboodle/RVBook.h
index 8b051851..d1037b2c 100644
--- a/UICaboodle/RVBook.h
+++ b/UICaboodle/RVBook.h
@@ -34,8 +34,8 @@
 - (void) resetViewAnimated:(BOOL)animated;
 - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page;
 
-- (void) setTitle:(NSString *)title forPage:(RVPage *)page;
 - (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page;
+- (void) reloadTitleForPage:(RVPage *)page;
 - (void) reloadButtonsForPage:(RVPage *)page;
 - (NSString *) getTitleForPage:(RVPage *)page;
 
diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index cef1acee..708e66f3 100644
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -157,18 +157,19 @@
     [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO];
 }
 
-- (void) setTitle:(NSString *)title forPage:(RVPage *)page {
+- (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page {
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;
     UINavigationItem *navitem = [navbar_ topItem];
-    [navitem setTitle:title];
+    [navitem setBackButtonTitle:title];
 }
 
-- (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page {
+- (void) reloadTitleForPage:(RVPage *)page {
     if ([pages_ count] == 0 || page != [pages_ lastObject])
         return;
     UINavigationItem *navitem = [navbar_ topItem];
-    [navitem setBackButtonTitle:title];
+    NSString *title = [self getTitleForPage:page];
+    [navitem setTitle:title];
 }
 
 - (void) reloadButtonsForPage:(RVPage *)page {
diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h
index 67b73d68..fa77df3a 100644
--- a/UICaboodle/RVPage.h
+++ b/UICaboodle/RVPage.h
@@ -25,7 +25,6 @@
 - (void) setPageActive:(BOOL)active;
 - (void) resetViewAnimated:(BOOL)animated;
 
-- (void) setTitle:(NSString *)title;
 - (void) setBackButtonTitle:(NSString *)title;
 
 - (void) reloadButtons;
diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm
index 5d29a266..02135c13 100644
--- a/UICaboodle/RVPage.mm
+++ b/UICaboodle/RVPage.mm
@@ -51,10 +51,6 @@
     [self doesNotRecognizeSelector:_cmd];
 }
 
-- (void) setTitle:(NSString *)title {
-    [book_ setTitle:title forPage:self];
-}
-
 - (void) setBackButtonTitle:(NSString *)title {
     [book_ setBackButtonTitle:title forPage:self];
 }