diff --git a/media/iphone/Classes/FeedDetailViewController.m b/media/iphone/Classes/FeedDetailViewController.m index f076989c5..9c0ad7f34 100644 --- a/media/iphone/Classes/FeedDetailViewController.m +++ b/media/iphone/Classes/FeedDetailViewController.m @@ -22,7 +22,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { } return self; } diff --git a/media/iphone/Classes/NewsBlurAppDelegate.m b/media/iphone/Classes/NewsBlurAppDelegate.m index 81f833a44..6a5c1fae5 100644 --- a/media/iphone/Classes/NewsBlurAppDelegate.m +++ b/media/iphone/Classes/NewsBlurAppDelegate.m @@ -121,7 +121,7 @@ + (int)computeStoryScore:(NSDictionary *)intelligence { int score = 0; - int score_max = 0; +// int score_max = 0; // [intelligence objectForKey:@"title"] // var score_max = Math.max(story.intelligence['title'], // story.intelligence['author'], diff --git a/media/iphone/Classes/NewsBlurViewController.m b/media/iphone/Classes/NewsBlurViewController.m index 13cf671a4..1bc97606e 100644 --- a/media/iphone/Classes/NewsBlurViewController.m +++ b/media/iphone/Classes/NewsBlurViewController.m @@ -153,6 +153,7 @@ [results release]; [jsonString release]; } + [jsonString release]; } @@ -166,6 +167,7 @@ LogoutDelegate *ld = [LogoutDelegate alloc]; NSURLConnection *urlConnection = [[NSURLConnection alloc] initWithRequest:urlR delegate:ld]; [urlConnection release]; + [ld release]; } #pragma mark - diff --git a/media/iphone/Classes/StoryDetailViewController.m b/media/iphone/Classes/StoryDetailViewController.m index 9d6e0d17e..763c25e12 100644 --- a/media/iphone/Classes/StoryDetailViewController.m +++ b/media/iphone/Classes/StoryDetailViewController.m @@ -24,7 +24,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { } return self; } @@ -72,8 +72,8 @@ - (void)requestFailed:(ASIHTTPRequest *)request { - NSError *error = [request error]; - [error release]; +// NSError *error = [request error]; +// [error release]; } diff --git a/media/iphone/NewsBlur.xcodeproj/project.pbxproj b/media/iphone/NewsBlur.xcodeproj/project.pbxproj index ffe03101b..c48a80f44 100755 --- a/media/iphone/NewsBlur.xcodeproj/project.pbxproj +++ b/media/iphone/NewsBlur.xcodeproj/project.pbxproj @@ -392,10 +392,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = NewsBlur_Prefix.pch; - HEADER_SEARCH_PATHS = ( - "~/three20/Build/Products/three20", - "~/Projects/three20/Build/Products/three20", - ); + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "NewsBlur-Info.plist"; OTHER_LDFLAGS = ( "-all_load", @@ -412,24 +409,9 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = NewsBlur_Prefix.pch; - HEADER_SEARCH_PATHS = ../../../code/three20/Build/Products/three20; + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "NewsBlur-Info.plist"; - OTHER_LDFLAGS = ( - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20UICommon.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20UINavigator.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20Core.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20UI.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20Network.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20Style.a", - ); + OTHER_LDFLAGS = ""; PRODUCT_NAME = NewsBlur; VALIDATE_PRODUCT = YES; }; @@ -444,6 +426,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "~/code/three20/Build/Products/three20"; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; OTHER_LDFLAGS = ( "-all_load", "-ObjC", @@ -462,9 +445,10 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; - SDKROOT = iphoneos3.1.3; + SDKROOT = iphoneos; }; name = Release; }; diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js index 76b730397..3c296503a 100644 --- a/media/js/newsblur/reader.js +++ b/media/js/newsblur/reader.js @@ -125,7 +125,8 @@ west__size: this.model.preference('feed_pane_size'), west__onresize_end: $.rescope(this.save_feed_pane_size, this), spacing_open: 4, - resizerDragOpacity: 0.6 + resizerDragOpacity: 0.6, + enableCursorHotkey: false }); leftLayout = $('.left-pane').layout({ @@ -137,7 +138,8 @@ south__paneSelector: ".left-south", south__size: 31, south__resizable: false, - south__spacing_open: 0 + south__spacing_open: 0, + enableCursorHotkey: false }); leftCenterLayout = $('.left-center').layout({ @@ -155,7 +157,8 @@ south__initClosed: true, fxName: "slide", fxSpeed: 1000, - fxSettings: { duration: 1000, easing: "easeInOutQuint" } + fxSettings: { duration: 1000, easing: "easeInOutQuint" }, + enableCursorHotkey: false }); rightLayout = $('.right-pane').layout({ @@ -164,7 +167,8 @@ south__size: this.model.preference('story_titles_pane_size'), south__onresize_end: $.rescope(this.save_story_titles_pane_size, this), spacing_open: 10, - resizerDragOpacity: 0.6 + resizerDragOpacity: 0.6, + enableCursorHotkey: false }); contentLayout = this.$s.$content_pane.layout({ @@ -172,7 +176,8 @@ south__paneSelector: ".content-north", south__size: 30, spacing_open: 0, - resizerDragOpacity: 0.6 + resizerDragOpacity: 0.6, + enableCursorHotkey: false }); $('.right-pane').hide();