From 649fc6d6c2adaea30b0adff5d83ac634b075ce63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= <eloy.de.enige@gmail.com>
Date: Wed, 27 Aug 2014 19:29:39 +0200
Subject: [PATCH] Revert "[osx] Allow the user to configure a NSApplication
 subclass and use that instead."

This reverts commit 51538c0ac769c7e49af64c9b18d0a2c60ce1712d.

Conflicts:
	test/test/spec/main_spec.rb
---
 lib/motion/project/template/osx/config.rb | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/motion/project/template/osx/config.rb b/lib/motion/project/template/osx/config.rb
index d06fd58a..dffb0b4e 100644
--- a/lib/motion/project/template/osx/config.rb
+++ b/lib/motion/project/template/osx/config.rb
@@ -230,36 +230,20 @@ EOS
     end
     main_txt << <<EOS
     RubyMotionInit(argc, argv);
-    NSApplication *app = [NSClassFromString(@"#{info_plist['NSPrincipalClass']}") sharedApplication];
+    NSApplication *app = [NSApplication sharedApplication];
     [app setDelegate:[NSClassFromString(@"#{delegate_class}") new]];
 EOS
     if spec_mode
       main_txt << "SpecLauncher *specLauncher = [[SpecLauncher alloc] init];\n"
       main_txt << "[[NSNotificationCenter defaultCenter] addObserver:specLauncher selector:@selector(appLaunched:) name:NSApplicationDidFinishLaunchingNotification object:nil];\n"
     end
-    if use_application_main_function?
-      main_txt << "NSApplicationMain(argc, (const char **)argv);\n"
-    else
-      main_txt << "[app run];\n"
-    end
     main_txt << <<EOS
+    NSApplicationMain(argc, (const char **)argv);
     [pool release];
     rb_exit(0);
     return 0;
 }
 EOS
     end
-
-    # If the user specifies a custom principal class the NSApplicationMain()
-    # function will only work if they have also specified a nib or storyboard.
-    def use_application_main_function?
-      info = info_plist
-      if info['NSPrincipalClass'] == 'NSApplication'
-        true
-      else
-        files = info.values_at('NSMainNibFile', 'NSMainStoryboardFile').compact
-        files.any? { |file| !file.strip.empty? }
-      end
-    end
   end
 end; end