Add sandbox support

psychs · Jul 28, 2012 · d0c7831 · d0c7831
1 parent 5a032d7
commit d0c7831
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 40 deletions.
diff --git a/Classes/Controllers/LimeChatApplication.m b/Classes/Controllers/LimeChatApplication.m
@@ -22,7 +22,7 @@ - (id)init
     if (self) {
 #ifndef TARGET_APP_STORE
         // migrate from the old .plist
-        CFPreferencesAddSuitePreferencesToApp(kCFPreferencesCurrentApplication, CFSTR("LimeChat"));
+        //CFPreferencesAddSuitePreferencesToApp(kCFPreferencesCurrentApplication, CFSTR("LimeChat"));
 #endif
 
         [Preferences migrate];

diff --git a/Classes/Preferences/ViewTheme.m b/Classes/Preferences/ViewTheme.m
@@ -140,12 +140,16 @@ + (NSString*)resourceBasePath
 + (NSString*)userBasePath
 {
     if (!userBasePath) {
-#ifdef TARGET_APP_STORE
-        NSString* bundleId = [[NSBundle mainBundle] bundleIdentifier];
-        userBasePath = [[[NSString stringWithFormat:@"~/Library/Application Support/%@/Themes", bundleId] stringByExpandingTildeInPath] retain];
-#else
-        userBasePath = [[@"~/Library/Application Support/LimeChat/Themes" stringByExpandingTildeInPath] retain];
-#endif
+        NSString* applicationSupportPath = NSHomeDirectory();
+        NSArray* ary = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask];
+        if (ary.count) {
+            applicationSupportPath = [ary[0] path];
+        }
+
+        NSString* path = applicationSupportPath;
+        path = [path stringByAppendingPathComponent:@"LimeChat"];
+        path = [path stringByAppendingPathComponent:@"Themes"];
+        userBasePath = [path retain];
     }
     return userBasePath;
 }

diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib
@@ -187,7 +187,7 @@
 												<string key="NSFrame">{{28, 24}, {160, 18}}</string>
 												<reference key="NSSuperview" ref="697370398"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="460984590"/>
+												<reference key="NSNextKeyView"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="287065986">
 													<int key="NSCellFlags">-2080374784</int>
@@ -1395,15 +1395,19 @@
 											<object class="NSTextField" id="762295480">
 												<reference key="NSNextResponder" ref="891492072"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{14, 283}, {411, 14}}</string>
+												<string key="NSFrame">{{14, 281}, {406, 16}}</string>
 												<reference key="NSSuperview" ref="891492072"/>
 												<reference key="NSNextKeyView" ref="620155777"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="183024327">
 													<int key="NSCellFlags">67108928</int>
-													<int key="NSCellFlags2">71435264</int>
-													<string key="NSContents">User theme path: ~/Library/Application Support/LimeChat/Themes</string>
-													<reference key="NSSupport" ref="26"/>
+													<int key="NSCellFlags2">272761856</int>
+													<string key="NSContents">User theme path: Application Support/LimeChat/Themes</string>
+													<object class="NSFont" key="NSSupport" id="90392730">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">12</double>
+														<int key="NSfFlags">16</int>
+													</object>
 													<reference key="NSControlView" ref="762295480"/>
 													<reference key="NSBackgroundColor" ref="326222776"/>
 													<reference key="NSTextColor" ref="263221525"/>
@@ -1552,11 +1556,7 @@
 																	<int key="NSCellFlags">75497472</int>
 																	<int key="NSCellFlags2">0</int>
 																	<string key="NSContents"/>
-																	<object class="NSFont" key="NSSupport" id="90392730">
-																		<string key="NSName">LucidaGrande</string>
-																		<double key="NSSize">12</double>
-																		<int key="NSfFlags">16</int>
-																	</object>
+																	<reference key="NSSupport" ref="90392730"/>
 																	<object class="NSColor" key="NSBackgroundColor">
 																		<int key="NSColorSpace">3</int>
 																		<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
@@ -1754,7 +1754,7 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{217, 32}, {134, 21}}</string>
 												<reference key="NSSuperview" ref="891492072"/>
-												<reference key="NSNextKeyView" ref="460984590"/>
+												<reference key="NSNextKeyView"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSSliderCell" key="NSCell" id="1069927312">
 													<int key="NSCellFlags">-2080374784</int>
@@ -1875,7 +1875,7 @@
 																<int key="NSvFlags">256</int>
 																<string key="NSFrameSize">{403, 178}</string>
 																<reference key="NSSuperview" ref="108631011"/>
-																<reference key="NSNextKeyView" ref="341263181"/>
+																<reference key="NSNextKeyView" ref="97585446"/>
 																<bool key="NSEnabled">YES</bool>
 																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 																<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -2108,13 +2108,12 @@
 												</object>
 												<string key="NSFrame">{{17, 17}, {405, 196}}</string>
 												<reference key="NSSuperview" ref="528046259"/>
-												<reference key="NSNextKeyView" ref="97585446"/>
+												<reference key="NSNextKeyView" ref="108631011"/>
 												<int key="NSsFlags">133682</int>
 												<reference key="NSVScroller" ref="341263181"/>
 												<reference key="NSHScroller" ref="255446444"/>
 												<reference key="NSContentView" ref="108631011"/>
 												<reference key="NSHeaderClipView" ref="97585446"/>
-												<reference key="NSCornerView" ref="704437210"/>
 												<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 												<double key="NSMinMagnification">0.25</double>
 												<double key="NSMaxMagnification">4</double>

diff --git a/LimeChat.entitlements b/LimeChat.entitlements
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.downloads.read-write</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>
diff --git a/LimeChat.xcodeproj/project.pbxproj b/LimeChat.xcodeproj/project.pbxproj
@@ -171,11 +171,14 @@
 		783E6ADB1173802100261552 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 783E6AD91173802100261552 /* main.m */; };
 		784BBE941085BC950080898B /* bluestar.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 784BBE901085BC950080898B /* bluestar.tiff */; };
 		784BBE971085BC950080898B /* redstar.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 784BBE931085BC950080898B /* redstar.tiff */; };
+		785B006A15C411D7009A2E36 /* container-migration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 785B006915C411D7009A2E36 /* container-migration.plist */; };
+		785B006D15C411E1009A2E36 /* container-migration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 785B006C15C411E1009A2E36 /* container-migration.plist */; };
 		787F49421589809F003AADE2 /* TwitterAvatarURLManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 787F49411589809F003AADE2 /* TwitterAvatarURLManager.m */; };
 		787F49431589809F003AADE2 /* TwitterAvatarURLManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 787F49411589809F003AADE2 /* TwitterAvatarURLManager.m */; };
 		787F494715898166003AADE2 /* TwitterImageURLClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 787F494615898166003AADE2 /* TwitterImageURLClient.m */; };
 		787F494815898166003AADE2 /* TwitterImageURLClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 787F494615898166003AADE2 /* TwitterImageURLClient.m */; };
 		78835406109FEA7F00CD2FFF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78835405109FEA7F00CD2FFF /* SystemConfiguration.framework */; };
+		788B9A3915C3F0FA00457ADD /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 78B9B86213F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict */; };
 		789ED3F31193EF4400CFC0B2 /* IgnoreItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 789ED3F21193EF4400CFC0B2 /* IgnoreItem.m */; };
 		789ED4841193F9EB00CFC0B2 /* IgnoreItemSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 789ED4831193F9EB00CFC0B2 /* IgnoreItemSheet.m */; };
 		789ED4B31193FA9E00CFC0B2 /* IgnoreItemSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 789ED4B11193FA9E00CFC0B2 /* IgnoreItemSheet.xib */; };
@@ -298,7 +301,6 @@
 		78B9B85D13F1E698005E1BC8 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 78B9B84013F1E677005E1BC8 /* Growl.framework */; };
 		78B9B85E13F1E69B005E1BC8 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 78B9B84013F1E677005E1BC8 /* Growl.framework */; };
 		78B9B86313F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 78B9B86213F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict */; };
-		78B9B86413F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict in Resources */ = {isa = PBXBuildFile; fileRef = 78B9B86213F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict */; };
 		78C2D609115A428C00705817 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 78C2D608115A428C00705817 /* dsa_pub.pem */; };
 		78E572390C1C30BA00BDF7EC /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		78E5723B0C1C30BA00BDF7EC /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 788D56F00BB6872B00DDBF69 /* WebKit.framework */; };
@@ -369,7 +371,7 @@
 		780FF69E11813BC3003C7648 /* CustomJSFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomJSFile.m; sourceTree = "<group>"; };
 		78287EA90D742DAA008D5656 /* Themes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Themes; path = Resources/Themes; sourceTree = "<group>"; };
 		782DA90012DB5A3800C07861 /* LimeChat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LimeChat.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		782DA90212DB5A3800C07861 /* Info-AppStore.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AppStore.plist"; path = "Others/Info-AppStore.plist"; sourceTree = "<group>"; };
+		782DA90212DB5A3800C07861 /* Info-AppStore.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-AppStore.plist"; sourceTree = "<group>"; };
 		782FCF871173824C007BE697 /* LimeChatApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LimeChatApplication.h; sourceTree = "<group>"; };
 		782FCF881173824C007BE697 /* LimeChatApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LimeChatApplication.m; sourceTree = "<group>"; };
 		78347EBA1158D4B00073E2F0 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/AutoOpDialog.xib; sourceTree = "<group>"; };
@@ -391,6 +393,8 @@
 		783E6AD91173802100261552 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		784BBE901085BC950080898B /* bluestar.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = bluestar.tiff; sourceTree = "<group>"; };
 		784BBE931085BC950080898B /* redstar.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = redstar.tiff; sourceTree = "<group>"; };
+		785B006915C411D7009A2E36 /* container-migration.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "container-migration.plist"; sourceTree = "<group>"; };
+		785B006C15C411E1009A2E36 /* container-migration.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "container-migration.plist"; sourceTree = "<group>"; };
 		787F49401589809F003AADE2 /* TwitterAvatarURLManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwitterAvatarURLManager.h; sourceTree = "<group>"; };
 		787F49411589809F003AADE2 /* TwitterAvatarURLManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TwitterAvatarURLManager.m; sourceTree = "<group>"; };
 		787F494515898166003AADE2 /* TwitterImageURLClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwitterImageURLClient.h; sourceTree = "<group>"; };
@@ -621,9 +625,10 @@
 		78B2DF1F0D0417160092EBDA /* application.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = application.icns; path = ../icon/application.icns; sourceTree = "<group>"; };
 		78B9B84013F1E677005E1BC8 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = "<group>"; };
 		78B9B86213F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "Growl Registration Ticket.growlRegDict"; path = "Others/Growl Registration Ticket.growlRegDict"; sourceTree = "<group>"; };
-		78C2D608115A428C00705817 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = etc/dsa_pub.pem; sourceTree = "<group>"; };
-		78C8911B1173806A002EED61 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Others/Info.plist; sourceTree = "<group>"; };
+		78C2D608115A428C00705817 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../../etc/dsa_pub.pem; sourceTree = "<group>"; };
+		78C8911B1173806A002EED61 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		78E570D00C1C306500BDF7EC /* LimeChat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LimeChat.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		78F786AD15C3F30D00B7937A /* LimeChat.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = LimeChat.entitlements; sourceTree = "<group>"; };
 		78FA9F641085AA1400001F13 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -696,9 +701,10 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				785B006B15C411E1009A2E36 /* Normal */,
+				785B006815C411D7009A2E36 /* AppStore */,
 				784BBE8F1085BC950080898B /* images */,
-				78C8911B1173806A002EED61 /* Info.plist */,
-				782DA90212DB5A3800C07861 /* Info-AppStore.plist */,
+				78F786AD15C3F30D00B7937A /* LimeChat.entitlements */,
 				78347EC31158D4B00073E2F0 /* MainMenu.xib */,
 				78347ECB1158D4B00073E2F0 /* Preferences.xib */,
 				78347EC71158D4B00073E2F0 /* NickSheet.xib */,
@@ -715,7 +721,6 @@
 				78347EC11158D4B00073E2F0 /* ListDialog.xib */,
 				78347EB91158D4B00073E2F0 /* AutoOpDialog.xib */,
 				78AD78E20C61B8F8001E77F4 /* Localizable.strings */,
-				78C2D608115A428C00705817 /* dsa_pub.pem */,
 				78B9B86213F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict */,
 				78287EA90D742DAA008D5656 /* Themes */,
 			);
@@ -725,9 +730,9 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
 				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
 				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
 				787FD46C0BFE960100F2F22D /* Carbon.framework */,
 				780253C20C09525900C170D4 /* CoreServices.framework */,
 				788D56F00BB6872B00DDBF69 /* WebKit.framework */,
@@ -758,6 +763,27 @@
 			path = Resources/images;
 			sourceTree = "<group>";
 		};
+		785B006815C411D7009A2E36 /* AppStore */ = {
+			isa = PBXGroup;
+			children = (
+				782DA90212DB5A3800C07861 /* Info-AppStore.plist */,
+				785B006915C411D7009A2E36 /* container-migration.plist */,
+			);
+			name = AppStore;
+			path = Others/AppStore;
+			sourceTree = "<group>";
+		};
+		785B006B15C411E1009A2E36 /* Normal */ = {
+			isa = PBXGroup;
+			children = (
+				78C8911B1173806A002EED61 /* Info.plist */,
+				785B006C15C411E1009A2E36 /* container-migration.plist */,
+				78C2D608115A428C00705817 /* dsa_pub.pem */,
+			);
+			name = Normal;
+			path = Others/Normal;
+			sourceTree = "<group>";
+		};
 		78A8C0C111737F660044E7A1 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1216,7 +1242,8 @@
 				782DA86F12DB5A3800C07861 /* COPYING in Resources */,
 				782DA87012DB5A3800C07861 /* InviteSheet.xib in Resources */,
 				782DA87112DB5A3800C07861 /* IgnoreItemSheet.xib in Resources */,
-				78B9B86413F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict in Resources */,
+				788B9A3915C3F0FA00457ADD /* Growl Registration Ticket.growlRegDict in Resources */,
+				785B006A15C411D7009A2E36 /* container-migration.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1247,6 +1274,7 @@
 				78A7B5DA11745616006B324A /* InviteSheet.xib in Resources */,
 				789ED4B31193FA9E00CFC0B2 /* IgnoreItemSheet.xib in Resources */,
 				78B9B86313F1E6EF005E1BC8 /* Growl Registration Ticket.growlRegDict in Resources */,
+				785B006D15C411E1009A2E36 /* container-migration.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1640,42 +1668,48 @@
 		782DA8FE12DB5A3800C07861 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_ENTITLEMENTS = LimeChat.entitlements;
+				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application: Satoshi Nakagawa";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					TARGET_APP_STORE,
 					DEBUG_BUILD,
 				);
-				INFOPLIST_FILE = "Others/Info-AppStore.plist";
+				INFOPLIST_FILE = "Others/AppStore/Info-AppStore.plist";
+				PROVISIONING_PROFILE = "CCD0E816-CAFB-4747-9F7C-06852556940C";
 			};
 			name = Debug;
 		};
 		782DA8FF12DB5A3800C07861 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_ENTITLEMENTS = LimeChat.entitlements;
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application: Satoshi Nakagawa";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = TARGET_APP_STORE;
-				INFOPLIST_FILE = "Others/Info-AppStore.plist";
+				INFOPLIST_FILE = "Others/AppStore/Info-AppStore.plist";
 				PROVISIONING_PROFILE = "CCD0E816-CAFB-4747-9F7C-06852556940C";
 			};
 			name = Release;
 		};
 		78E570D40C1C306500BDF7EC /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_ENTITLEMENTS = LimeChat.entitlements;
+				CODE_SIGN_IDENTITY = "Developer ID Application: Satoshi Nakagawa";
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Others/Info.plist;
+				INFOPLIST_FILE = Others/Normal/Info.plist;
+				PROVISIONING_PROFILE = "";
 			};
 			name = Debug;
 		};
 		78E570D50C1C306500BDF7EC /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_ENTITLEMENTS = LimeChat.entitlements;
 				CODE_SIGN_IDENTITY = "Developer ID Application: Satoshi Nakagawa";
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Others/Info.plist;
+				INFOPLIST_FILE = Others/Normal/Info.plist;
 				PROVISIONING_PROFILE = "";
 			};
 			name = Release;

diff --git a/Others/Info-AppStore.plist → Others/AppStore/Info-AppStore.plist b/Others/Info-AppStore.plist → Others/AppStore/Info-AppStore.plist
@@ -39,7 +39,7 @@
 	<key>LCApplicationName</key>
 	<string>LimeChat for Mac</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7.0</string>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2007-2012 Satoshi Nakagawa</string>
 	<key>NSMainNibFile</key>