Merge pull request #1 from acrollet/master

Mac OS Sierra updates
fikovnik · Oct 5, 2016 · 18431ac · 18431ac
2 parents 9c0a80e + e259f22
commit 18431ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/GMailinator.xcodeproj/project.pbxproj b/GMailinator.xcodeproj/project.pbxproj
@@ -131,7 +131,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 499015E81615FE5300991F6C /* Build configuration list for PBXNativeTarget "GMailinator" */;
 			buildPhases = (
-                A718F5961A681B6700545966 /* Save current UUID to Info.plist */,
+				A718F5961A681B6700545966 /* Save current UUID to Info.plist */,
 				499015D61615FE5300991F6C /* Sources */,
 				499015D71615FE5300991F6C /* Frameworks */,
 				499015D81615FE5300991F6C /* Resources */,

diff --git a/GMailinator/GMailinator.m b/GMailinator/GMailinator.m
@@ -232,8 +232,14 @@ -(NSEvent*)getShortcutRemappedEventFor:(NSEvent*)event {
 }
 
 - (void)overrideMailKeyDown:(NSEvent*)event {
-    id messageViewer = [[self performSelector:@selector(delegate)]
-                        performSelector:@selector(delegate)];
+    id tableViewManager = [self performSelector:@selector(delegate)];
+    id messageListViewController = [tableViewManager performSelector:@selector(delegate)];
+
+    // NOTE: backwards compatibility. In 10.11 and earlier, tableViewManager.delegate.delegate was already the message viewer.
+    id messageViewer
+        = [messageListViewController respondsToSelector:@selector(messageViewer)]
+        ? [messageListViewController performSelector:@selector(messageViewer)]
+        : messageListViewController;
 
     if (! [self performSelectorOnMessageViewer:messageViewer basedOnEvent:event]) {
         [self overrideMailKeyDown:[self getShortcutRemappedEventFor:event]];

diff --git a/GMailinator/Info.plist b/GMailinator/Info.plist