diff options
Diffstat (limited to 'UICaboodle/BrowserView.mm')
-rw-r--r-- | UICaboodle/BrowserView.mm | 58 |
1 files changed, 9 insertions, 49 deletions
diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 43f2905..b5a7b90 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -483,13 +483,6 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se if (request_ != nil) [request_ release]; - if (custom_ != nil) - [custom_ release]; - if (style_ != nil) - [style_ release]; - - if (function_ != nil) - [function_ release]; if (closer_ != nil) [closer_ release]; @@ -579,51 +572,18 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se } - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { - if (custom_ != nil) - [custom_ autorelease]; - if (button == nil) - custom_ = nil; - else - custom_ = [[UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:button]]] retain]; - - if (style_ != nil) - [style_ autorelease]; - if (style == nil) - style_ = nil; - else - style_ = [style retain]; - - if (function_ != nil) - [function_ autorelease]; - if (function == nil) - function_ = nil; - else - function_ = [function retain]; + custom_ = button; + style_ = style; + function_ = function; [self performSelectorOnMainThread:@selector(applyRightButton) withObject:nil waitUntilDone:NO]; } - (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { - if (custom_ != nil) - [custom_ autorelease]; - if (button == nil) - custom_ = nil; - else - custom_ = [button retain]; - - if (style_ != nil) - [style_ autorelease]; - if (style == nil) - style_ = nil; - else - style_ = [style retain]; + custom_ = button; + style_ = style; + function_ = function; - if (function_ != nil) - [function_ autorelease]; - if (function == nil) - function_ = nil; - else - function_ = [function retain]; [self performSelectorOnMainThread:@selector(applyRightButton) withObject:nil waitUntilDone:NO]; } @@ -840,9 +800,9 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se if ([frame parentFrame] == nil) { CYRelease(title_); - CYRelease(custom_); - CYRelease(style_); - CYRelease(function_); + custom_ = nil; + style_ = nil; + function_ = nil; CYRelease(closer_); // XXX: do we still need to do this? |