From 1d60772b06214d2f4d6178d9219bf89ead4a469d Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Mon, 3 Mar 2014 12:12:06 -0800
Subject: [PATCH] Relative dependency path. Fixes #493.

---
 clients/ios/Classes/NewsBlurAppDelegate.m      | 13 ++++++++-----
 clients/ios/NewsBlur.xcodeproj/project.pbxproj |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m
index 63abcb921..1d48e82fa 100644
--- a/clients/ios/Classes/NewsBlurAppDelegate.m
+++ b/clients/ios/Classes/NewsBlurAppDelegate.m
@@ -210,6 +210,9 @@
 	return YES;
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    self.title = @"All";
+}
 
 - (void)application:(UIApplication *)application
     performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
@@ -1130,14 +1133,14 @@
     }
     
     if (feedDetailView == feedDetailViewController) {
+        UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All"
+                                                                          style: UIBarButtonItemStyleBordered
+                                                                         target: nil
+                                                                         action: nil];
+        [feedsViewController.navigationItem setBackBarButtonItem: newBackButton];
         if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
             [self.masterContainerViewController transitionToFeedDetail];
         } else {
-            UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All" 
-                                                                              style: UIBarButtonItemStyleBordered 
-                                                                             target: nil 
-                                                                             action: nil];
-            [feedDetailViewController.navigationItem setBackBarButtonItem: newBackButton];
             UINavigationController *navController = self.navigationController;
             [navController pushViewController:feedDetailViewController animated:YES];
         }
diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
index 865d8edd8..6ca5d16a5 100755
--- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj
+++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
@@ -3463,7 +3463,7 @@
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/sclay/projects/newsblur/clients/ios/Other\\ Sources/Overshare\\ Kit/Dependencies/GooglePlus-SDK",
+					"\"Other Sources/Overshare Kit/Dependencies/GooglePlus-SDK/\"",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -3505,7 +3505,7 @@
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"/Users/sclay/projects/newsblur/clients/ios/Other\\ Sources/Overshare\\ Kit/Dependencies/GooglePlus-SDK",
+					"\"Other Sources/Overshare Kit/Dependencies/GooglePlus-SDK/\"",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = NewsBlur_Prefix.pch;