Support libraries for recent Cydia changes.

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 48dac915377c01dd7f95c9f07c887e7f0219d31a..0f35cb7be3b035b3627b1b4ea71e81a5118cceb8 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -15,7 +15,6 @@
 @class IndirectDelegate;
 
 @interface BrowserView : RVPage {
 @class IndirectDelegate;
 
 @interface BrowserView : RVPage {

-    _transient Database *database_;

     UIScroller *scroller_;
     UIWebDocumentView *webview_;
     NSMutableArray *urls_;
     UIScroller *scroller_;
     UIWebDocumentView *webview_;
     NSMutableArray *urls_;


@@ -37,7 +36,7 @@
 
 - (WebView *) webView;
 
 
 - (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;
 
 - (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 8b0518515db98b569eb3a16a8ae5e634bf7e2876..d1037b2c619dff7269e276113b450e357626be45 100644 (file)
--- a/UICaboodle/RVBook.h
+++ b/UICaboodle/RVBook.h
@@ -34,8 +34,8 @@
 - (void) resetViewAnimated:(BOOL)animated;
 - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page;
 
 - (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) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page;

+- (void) reloadTitleForPage:(RVPage *)page;

 - (void) reloadButtonsForPage:(RVPage *)page;
 - (NSString *) getTitleForPage:(RVPage *)page;
 
 - (void) reloadButtonsForPage:(RVPage *)page;
 - (NSString *) getTitleForPage:(RVPage *)page;
 

diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm
index cef1acee62e297fb58d8ac6e6f68792f4753030b..708e66f381438e662aac38f2c14ac5e380130c76 100644 (file)
--- a/UICaboodle/RVBook.mm
+++ b/UICaboodle/RVBook.mm
@@ -157,18 +157,19 @@
     [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO];
 }
 
     [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];
     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];
     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 {
 }
 
 - (void) reloadButtonsForPage:(RVPage *)page {

diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h
index 67b73d68744a1fca2286f3ff84b8d797a9c3a422..fa77df3aa2d004393b1bcb8bde3201ac9824ed77 100644 (file)
--- a/UICaboodle/RVPage.h
+++ b/UICaboodle/RVPage.h
@@ -25,7 +25,6 @@
 - (void) setPageActive:(BOOL)active;
 - (void) resetViewAnimated:(BOOL)animated;
 
 - (void) setPageActive:(BOOL)active;
 - (void) resetViewAnimated:(BOOL)animated;
 

-- (void) setTitle:(NSString *)title;

 - (void) setBackButtonTitle:(NSString *)title;
 
 - (void) reloadButtons;
 - (void) setBackButtonTitle:(NSString *)title;
 
 - (void) reloadButtons;

diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm
index 5d29a2668f6586ba4827f6521bd68de601d0051c..02135c134c7a3d30930e874a299984602dbcf62f 100644 (file)
--- a/UICaboodle/RVPage.mm
+++ b/UICaboodle/RVPage.mm
@@ -51,10 +51,6 @@
     [self doesNotRecognizeSelector:_cmd];
 }
 
     [self doesNotRecognizeSelector:_cmd];
 }
 

-- (void) setTitle:(NSString *)title {
-    [book_ setTitle:title forPage:self];
-}
-

 - (void) setBackButtonTitle:(NSString *)title {
     [book_ setBackButtonTitle:title forPage:self];
 }
 - (void) setBackButtonTitle:(NSString *)title {
     [book_ setBackButtonTitle:title forPage:self];
 }