Merge branch 'release/EasySIMBL-1.5.1'

norio-nomura · Oct 29, 2013 · c82a733 · c82a733
2 parents 90999b8 + 99804d8
commit c82a733
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/EasySIMBL/EasySIMBL-Info.plist b/EasySIMBL/EasySIMBL-Info.plist
@@ -32,11 +32,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>8</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Changes from [original SIMBL](http://www.culater.net/software/SIMBL/SIMBL.php)
 
 How to install
 --------------
-1. Download [EasySIMBL-1.5.zip](http://github.com/norio-nomura/EasySIMBL/releases/download/EasySIMBL-1.5/EasySIMBL-1.5.zip) (2013/10/26 updated)
+1. Download [EasySIMBL-1.5.1.zip](http://github.com/norio-nomura/EasySIMBL/releases/download/EasySIMBL-1.5.1/EasySIMBL-1.5.1.zip) (2013/10/29 updated)
 2. Extract and move `EasySIMBL.app` into `/Applications` or `~/Applications`.
 3. Launch `EasySIMBL.app` and make check `Use SIMBL`, then quit `EasySIMBL.app`.
 
@@ -30,9 +30,19 @@ How to uninstall
 
 Tested combinations of OS X and applications
 --------------------------------------------
-- OS X 10.7.5 (11G63) : [Echofon for Mac 1.8.0](https://itunes.apple.com/jp/app/echofon-for-twitter/id403830270?mt=12) & [SimblPluginsForEchofon-1.4](https://github.com/norio-nomura/SimblPluginsForEchofon)
-- OS X 10.8.5 (12F45) : Safari 6.1 & [SafariStand 6.0.200](https://github.com/hetima/SafariStand), [Echofon for Mac 1.8.0](https://itunes.apple.com/jp/app/echofon-for-twitter/id403830270?mt=12) & [SimblPluginsForEchofon-1.4](https://github.com/norio-nomura/SimblPluginsForEchofon)
-- OS X 10.9 (13A603) : Safari 7.0 & [SafariStand 6.0.200](https://github.com/hetima/SafariStand), [Echofon for Mac 1.8.0](https://itunes.apple.com/jp/app/echofon-for-twitter/id403830270?mt=12) & [SimblPluginsForEchofon-1.4](https://github.com/norio-nomura/SimblPluginsForEchofon)
+- OS X 10.7.5 (11G63)
+	- Finder & [ColorfulSidebar 1.1.1](http://cooviewerzoom.web.fc2.com/colorfulsidebar.html) (without PowerboxInjector)
+	- [Echofon for Mac 1.8.0](https://itunes.apple.com/jp/app/echofon-for-twitter/id403830270?mt=12) & [SimblPluginsForEchofon-1.4](https://github.com/norio-nomura/SimblPluginsForEchofon)
+- OS X 10.8.5 (12F45)
+	- Finder & [ColorfulSidebar 1.1.1](http://cooviewerzoom.web.fc2.com/colorfulsidebar.html) (without PowerboxInjector)
+	- Safari 6.1 & [SafariStand 6.0.200](https://github.com/hetima/SafariStand)
+	- [Echofon for Mac 1.8.0](https://itunes.apple.com/jp/app/echofon-for-twitter/id403830270?mt=12) & [SimblPluginsForEchofon-1.4](https://github.com/norio-nomura/SimblPluginsForEchofon),
+- OS X 10.9 (13A603)
+	- Finder & [ColorfulSidebar 1.1.1](http://cooviewerzoom.web.fc2.com/colorfulsidebar.html) (without PowerboxInjector)
+	- Safari 7.0 & [SafariStand 6.0.200](https://github.com/hetima/SafariStand)
+	- [Echofon for Mac 1.8.0](https://itunes.apple.com/jp/app/echofon-for-twitter/id403830270?mt=12) & [SimblPluginsForEchofon-1.4](https://github.com/norio-nomura/SimblPluginsForEchofon)
+
+_PowerboxInjector is not compatible with EasySIMBL. Sorry, the reason exists on EasySIMBL side._
 
 License
 -------

diff --git a/SIMBL Agent/SIMBLAgent.m b/SIMBL Agent/SIMBLAgent.m
@@ -35,7 +35,7 @@ - (void) applicationDidFinishLaunching:(NSNotification*)notificaion
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,  NSUserDomainMask, YES);
     NSString *libraryPath = (NSString*)[paths objectAtIndex:0];
     self.scriptingAdditionsPath = [libraryPath stringByAppendingPathComponent:EasySIMBLScriptingAdditionsPathComponent];
-    self.osaxPath = [[NSBundle mainBundle]pathForResource:EasySIMBLBundleBaseName ofType:EasySIMBLBundleExtension];
+    self.osaxPath = [[[[NSBundle mainBundle]builtInPlugInsPath]stringByAppendingPathComponent:EasySIMBLBundleBaseName]stringByAppendingPathExtension:EasySIMBLBundleExtension];
     self.linkedOsaxPath = [self.scriptingAdditionsPath stringByAppendingPathComponent:EasySIMBLBundleName];
     self.waitingInjectionNumber = 0;
     self.applicationSupportPath = [SIMBL applicationSupportPath];
@@ -219,7 +219,12 @@ - (void) injectSIMBL:(NSRunningApplication *)runningApp
         // When initializing, you need to wait for the event reply, otherwise the
         // event might get dropped on the floor. This is only seems to happen in 10.5
         // but it shouldn't harm anything.
-        [sbApp setSendMode:kAEWaitReply | kAENeverInteract | kAEDontRecord];
+
+        // 10.9 stop responding here when injecting into some non-sandboxed apps,
+        // because those target apps never reply.
+        // EasySIMBL stop waiting reply.
+        // It works on OS X 10.7, 10.8 and 10.9 all of EasySIMBL target.
+        [sbApp setSendMode:kAENoReply | kAENeverInteract | kAEDontRecord];
         [sbApp sendEvent:kASAppleScriptSuite id:kGetAEUT parameters:0];
 
         // the reply here is of some unknown type - it is not an Objective-C object

diff --git a/SIMBL.xcodeproj/project.pbxproj b/SIMBL.xcodeproj/project.pbxproj
@@ -38,7 +38,7 @@
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
-			dstSubfolderSpec = 7;
+			dstSubfolderSpec = 13;
 			files = (
 				6CBB25FE159ECD63002C455C /* EasySIMBL.osax in CopyFiles */,
 			);
@@ -304,6 +304,7 @@
 		276144C4105F51CB00F906F6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -316,6 +317,7 @@
 		276144C5105F51CB00F906F6 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -330,6 +332,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = NO;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = rez/Info.plist;
@@ -344,6 +347,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = NO;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -369,7 +373,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_VERSION = 0.10.6;
+				PRODUCT_VERSION = 0.10.7;
 				SDKROOT = macosx;
 			};
 			name = Debug;
@@ -388,7 +392,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_VERSION = 0.10.6;
+				PRODUCT_VERSION = 0.10.7;
 				SDKROOT = macosx;
 			};
 			name = Release;