Merge lp:~urbanape/ubuntuone-ios-client/new-icons into lp:ubuntuone-ios-client

[Zachery Bir]

New icons and fixed the entitlements.plist.

[Aaron Brethorst (aaronbrethorst-deactivatedaccount)]

looks good!

review: Approve

=== modified file 'contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj'
--- contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj	2010-07-22 20:21:36 +0000
+++ contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj	2010-09-14 21:46:19 +0000
@@ -3436,7 +3436,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "libfunambol" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* mac */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -4319,6 +4326,7 @@
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = libfunambol;
+				SDKROOT = iphoneos4.1;
 			};
 			name = "iPhone-Release";
 		};
 
=== modified file 'contacts/iPhoneApp/Entitlements.plist'
--- contacts/iPhoneApp/Entitlements.plist	2010-09-08 08:13:04 +0000
+++ contacts/iPhoneApp/Entitlements.plist	2010-09-14 21:46:19 +0000
@@ -3,12 +3,12 @@
 <plist version="1.0">
 <dict>
 	<key>application-identifier</key>
-	<string>ABC1234DEF.com.ubuntu.one.music</string>
+	<string>UD653J2ZMP.com.ubuntu.one.iphoneplugin</string>
 	<key>get-task-allow</key>
 	<false/>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>ABC1234DEF.com.ubuntu.one</string>
+		<string>UD653J2ZMP.com.ubuntu.one</string>
 	</array>
 </dict>
 </plist>
 
=== added file 'contacts/iPhoneApp/Icon.png'
 Binary files contacts/iPhoneApp/Icon.png	1970-01-01 00:00:00 +0000 and contacts/iPhoneApp/Icon.png	2010-09-14 21:46:19 +0000 differ
=== added file 'contacts/iPhoneApp/[e-mail]'
 Binary files contacts/iPhoneApp/[e-mail]	1970-01-01 00:00:00 +0000 and contacts/iPhoneApp/[e-mail]	2010-09-14 21:46:19 +0000 differ
=== modified file 'contacts/iPhoneApp/UI/icons/logoImage.png'
 Binary files contacts/iPhoneApp/UI/icons/logoImage.png	2010-08-04 19:37:25 +0000 and contacts/iPhoneApp/UI/icons/logoImage.png	2010-09-14 21:46:19 +0000 differ
=== added file 'contacts/iPhoneApp/UI/icons/[e-mail]'
 Binary files contacts/iPhoneApp/UI/icons/[e-mail]	1970-01-01 00:00:00 +0000 and contacts/iPhoneApp/UI/icons/[e-mail]	2010-09-14 21:46:19 +0000 differ
=== modified file 'contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj'
--- contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-09-08 20:24:21 +0000
+++ contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-09-14 21:46:19 +0000
@@ -23,10 +23,12 @@
 		7C9F59500DAF67B9007E0091 /* stringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F594F0DAF67B9007E0091 /* stringUtils.cpp */; };
 		7C9F59620DAF683B007E0091 /* AddressBookSyncSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F59610DAF683B007E0091 /* AddressBookSyncSource.cpp */; };
 		9173D56212318DE2004CEDB9 /* URLQueryStringParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */; };
+		91B441F9123FF86900658AF4 /* logoImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 91B441F7123FF86900658AF4 /* logoImage.png */; };
+		91B441FA123FF86900658AF4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91B441F8123FF86900658AF4 /* [e-mail] */; };
+		91B4424D1240045C00658AF4 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 91B4424B1240045C00658AF4 /* Icon.png */; };
+		91B4424E1240045C00658AF4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91B4424C1240045C00658AF4 /* [e-mail] */; };
 		930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6611F9FB8800DD6D06 /* Default.png */; };
 		930D5A6B11F9FB8800DD6D06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6711F9FB8800DD6D06 /* [e-mail] */; };
-		930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6811F9FB8800DD6D06 /* Icon.png */; };
-		930D5A6D11F9FB8800DD6D06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6911F9FB8800DD6D06 /* [e-mail] */; };
 		935FCDDB12377B5300B5DF9B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 935FCDDA12377B5300B5DF9B /* Security.framework */; };
 		935FCDE512377BAC00B5DF9B /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 935FCDE412377BAC00B5DF9B /* SFHFKeychainUtils.m */; };
 		935FCDFB12377C8B00B5DF9B /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 935FCDFA12377C8B00B5DF9B /* Entitlements.plist */; };
@@ -69,7 +71,6 @@
 		AB33AAA00E5AE0460098F0A2 /* icon_sync_154x154_frame14.png in Resources */ = {isa = PBXBuildFile; fileRef = AB33AA900E5AE0460098F0A2 /* icon_sync_154x154_frame14.png */; };
 		AB33AAA10E5AE0460098F0A2 /* icon_sync_154x154_frame15.png in Resources */ = {isa = PBXBuildFile; fileRef = AB33AA910E5AE0460098F0A2 /* icon_sync_154x154_frame15.png */; };
 		AB3E86550E08090F00581A6C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB3E86540E08090F00581A6C /* SystemConfiguration.framework */; };
-		AB7C7D050DEC07A100F46ECA /* logoImage.png in Resources */ = {isa = PBXBuildFile; fileRef = AB7C7D040DEC07A100F46ECA /* logoImage.png */; };
 		AB8B508B0DE4384F005B47E4 /* apple-touch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */; };
 		AB926BE60DBCF087008E5FC6 /* AboutView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB926BE50DBCF087008E5FC6 /* AboutView.mm */; };
 		ABAEC2FC11DB5AD100A9D30F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABAEC2FB11DB5AD100A9D30F /* CFNetwork.framework */; };
@@ -130,7 +131,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1D6058910D05DD3D006BFB54 /* Funambol.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Funambol.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1D6058910D05DD3D006BFB54 /* funambol.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = funambol.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7C7647BA0DB361EE00786883 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = "<group>"; };
 		7C7647BB0DB361F500786883 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		7C849D1F0DB6371200AE7A7D /* iPhoneDefaultConfigFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iPhoneDefaultConfigFactory.h; sourceTree = "<group>"; };
@@ -160,10 +161,12 @@
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9173D4DF123019CC004CEDB9 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; };
 		9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = URLQueryStringParser.mm; sourceTree = "<group>"; };
+		91B441F7123FF86900658AF4 /* logoImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logoImage.png; sourceTree = "<group>"; };
+		91B441F8123FF86900658AF4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		91B4424B1240045C00658AF4 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
+		91B4424C1240045C00658AF4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		930D5A6611F9FB8800DD6D06 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
 		930D5A6711F9FB8800DD6D06 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
-		930D5A6811F9FB8800DD6D06 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
-		930D5A6911F9FB8800DD6D06 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		935FCDDA12377B5300B5DF9B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		935FCDE312377BA500B5DF9B /* SFHFKeychainUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFHFKeychainUtils.h; sourceTree = "<group>"; };
 		935FCDE412377BAC00B5DF9B /* SFHFKeychainUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFHFKeychainUtils.m; sourceTree = "<group>"; };
@@ -210,7 +213,6 @@
 		AB33AA900E5AE0460098F0A2 /* icon_sync_154x154_frame14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_sync_154x154_frame14.png; sourceTree = "<group>"; };
 		AB33AA910E5AE0460098F0A2 /* icon_sync_154x154_frame15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_sync_154x154_frame15.png; sourceTree = "<group>"; };
 		AB3E86540E08090F00581A6C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		AB7C7D040DEC07A100F46ECA /* logoImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logoImage.png; sourceTree = "<group>"; };
 		AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "apple-touch-icon.png"; sourceTree = "<group>"; };
 		AB926BE40DBCF07B008E5FC6 /* AboutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutView.h; sourceTree = "<group>"; };
 		AB926BE50DBCF087008E5FC6 /* AboutView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AboutView.mm; sourceTree = "<group>"; };
@@ -272,7 +274,7 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1D6058910D05DD3D006BFB54 /* Funambol.app */,
+				1D6058910D05DD3D006BFB54 /* funambol.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -295,11 +297,11 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				91B4424B1240045C00658AF4 /* Icon.png */,
+				91B4424C1240045C00658AF4 /* [e-mail] */,
 				935FCDFA12377C8B00B5DF9B /* Entitlements.plist */,
 				930D5A6611F9FB8800DD6D06 /* Default.png */,
 				930D5A6711F9FB8800DD6D06 /* [e-mail] */,
-				930D5A6811F9FB8800DD6D06 /* Icon.png */,
-				930D5A6911F9FB8800DD6D06 /* [e-mail] */,
 				ABA164000D9178CF0033F591 /* icons */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 			);
@@ -386,6 +388,8 @@
 		7C9F57AE0DAF5C50007E0091 /* icons */ = {
 			isa = PBXGroup;
 			children = (
+				91B441F7123FF86900658AF4 /* logoImage.png */,
+				91B441F8123FF86900658AF4 /* [e-mail] */,
 				93F312B71212AA1700B6FF0D /* u1_sync_button.png */,
 				93F312B81212AA1700B6FF0D /* [e-mail] */,
 				93F312941212A61E00B6FF0D /* bg_pattern.png */,
@@ -427,7 +431,6 @@
 				ABC5F1D00E24AFF400119787 /* button_onclick.png */,
 				ABC5F1D10E24AFF400119787 /* button_syncing.png */,
 				ABB027A20DF807D600CC4ECD /* icon_cleanup_small.png */,
-				AB7C7D040DEC07A100F46ECA /* logoImage.png */,
 				AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */,
 				ABD7A22A0DD0B95900E97F54 /* poweredby.png */,
 				7C9F57B30DAF5C50007E0091 /* Default.png */,
@@ -544,7 +547,7 @@
 			);
 			name = funambol;
 			productName = funambol;
-			productReference = 1D6058910D05DD3D006BFB54 /* Funambol.app */;
+			productReference = 1D6058910D05DD3D006BFB54 /* funambol.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -628,7 +631,6 @@
 				7C9F58120DAF5C50007E0091 /* worksettings.png in Resources */,
 				ABD7A22B0DD0B95900E97F54 /* poweredby.png in Resources */,
 				AB8B508B0DE4384F005B47E4 /* apple-touch-icon.png in Resources */,
-				AB7C7D050DEC07A100F46ECA /* logoImage.png in Resources */,
 				ABB027A30DF807D600CC4ECD /* icon_cleanup_small.png in Resources */,
 				ABC5F1D20E24AFF400119787 /* button_default.png in Resources */,
 				ABC5F1D30E24AFF400119787 /* button_onclick.png in Resources */,
@@ -652,8 +654,6 @@
 				ABBF2921104BCE15004A9F09 /* Localizable.strings in Resources */,
 				930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */,
 				930D5A6B11F9FB8800DD6D06 /* [e-mail] in Resources */,
-				930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */,
-				930D5A6D11F9FB8800DD6D06 /* [e-mail] in Resources */,
 				93F311DF1212811300B6FF0D /* [e-mail] in Resources */,
 				93F311E01212811300B6FF0D /* [e-mail] in Resources */,
 				93F311E11212811300B6FF0D /* [e-mail] in Resources */,
@@ -676,6 +676,10 @@
 				93F312B91212AA1700B6FF0D /* u1_sync_button.png in Resources */,
 				93F312BA1212AA1700B6FF0D /* [e-mail] in Resources */,
 				935FCDFB12377C8B00B5DF9B /* Entitlements.plist in Resources */,
+				91B441F9123FF86900658AF4 /* logoImage.png in Resources */,
+				91B441FA123FF86900658AF4 /* [e-mail] in Resources */,
+				91B4424D1240045C00658AF4 /* Icon.png in Resources */,
+				91B4424E1240045C00658AF4 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -985,7 +989,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_ENTITLEMENTS = dist.plist;
+				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Canonical Group Limited";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -1022,6 +1027,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = funambol;
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "615208E5-416A-4637-A746-45FB06299017";
 				SDKROOT = iphoneos4.1;
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 
=== removed file 'contacts/iPhoneApp/icon.png'
 Binary files contacts/iPhoneApp/icon.png	2010-08-24 20:32:41 +0000 and contacts/iPhoneApp/icon.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'contacts/iPhoneApp/[e-mail]'
 Binary files contacts/iPhoneApp/[e-mail]	2010-08-24 20:32:41 +0000 and contacts/iPhoneApp/[e-mail]	1970-01-01 00:00:00 +0000 differ