Ubuntu One iOS Client

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

  1. new-icons
  2. Merge into trunk
Proposed by Zachery Bir
Status: Merged
Approved by: Zachery Bir
Approved revision: 88
Merge reported by: Zachery Bir
Merged at revision: not available
Proposed branch: lp:~urbanape/ubuntuone-ios-client/new-icons
Merge into: lp:ubuntuone-ios-client
Diff against target: 212 lines (+32/-18)
3 files modified
contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj (+8/-0)
contacts/iPhoneApp/Entitlements.plist (+2/-2)
contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj (+22/-16)
To merge this branch: bzr merge lp:~urbanape/ubuntuone-ios-client/new-icons
Reviewer Review Type Date Requested Status
Aaron Brethorst (community) Approve
Review via email: mp+35475@code.launchpad.net

Description of the change

New icons and fixed the entitlements.plist.

To post a comment you must log in.
Revision history for this message
Aaron Brethorst (aaronbrethorst-deactivatedaccount) wrote :

looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj'
2--- contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj 2010-07-22 20:21:36 +0000
3+++ contacts/funambol-sdk/build/mac/libfunambol.xcodeproj/project.pbxproj 2010-09-14 21:46:19 +0000
4@@ -3436,7 +3436,14 @@
5 isa = PBXProject;
6 buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "libfunambol" */;
7 compatibilityVersion = "Xcode 3.1";
8+ developmentRegion = English;
9 hasScannedForEncodings = 1;
10+ knownRegions = (
11+ English,
12+ Japanese,
13+ French,
14+ German,
15+ );
16 mainGroup = 08FB7794FE84155DC02AAC07 /* mac */;
17 projectDirPath = "";
18 projectRoot = "";
19@@ -4319,6 +4326,7 @@
20 GCC_MODEL_TUNING = G5;
21 INSTALL_PATH = /usr/local/lib;
22 PRODUCT_NAME = libfunambol;
23+ SDKROOT = iphoneos4.1;
24 };
25 name = "iPhone-Release";
26 };
27
28=== modified file 'contacts/iPhoneApp/Entitlements.plist'
29--- contacts/iPhoneApp/Entitlements.plist 2010-09-08 08:13:04 +0000
30+++ contacts/iPhoneApp/Entitlements.plist 2010-09-14 21:46:19 +0000
31@@ -3,12 +3,12 @@
32 <plist version="1.0">
33 <dict>
34 <key>application-identifier</key>
35- <string>ABC1234DEF.com.ubuntu.one.music</string>
36+ <string>UD653J2ZMP.com.ubuntu.one.iphoneplugin</string>
37 <key>get-task-allow</key>
38 <false/>
39 <key>keychain-access-groups</key>
40 <array>
41- <string>ABC1234DEF.com.ubuntu.one</string>
42+ <string>UD653J2ZMP.com.ubuntu.one</string>
43 </array>
44 </dict>
45 </plist>
46
47=== added file 'contacts/iPhoneApp/Icon.png'
48Binary 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
49=== added file 'contacts/iPhoneApp/Icon@2x.png'
50Binary files contacts/iPhoneApp/Icon@2x.png 1970-01-01 00:00:00 +0000 and contacts/iPhoneApp/Icon@2x.png 2010-09-14 21:46:19 +0000 differ
51=== modified file 'contacts/iPhoneApp/UI/icons/logoImage.png'
52Binary 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
53=== added file 'contacts/iPhoneApp/UI/icons/logoImage@2x.png'
54Binary files contacts/iPhoneApp/UI/icons/logoImage@2x.png 1970-01-01 00:00:00 +0000 and contacts/iPhoneApp/UI/icons/logoImage@2x.png 2010-09-14 21:46:19 +0000 differ
55=== modified file 'contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj'
56--- contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj 2010-09-08 20:24:21 +0000
57+++ contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj 2010-09-14 21:46:19 +0000
58@@ -23,10 +23,12 @@
59 7C9F59500DAF67B9007E0091 /* stringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F594F0DAF67B9007E0091 /* stringUtils.cpp */; };
60 7C9F59620DAF683B007E0091 /* AddressBookSyncSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F59610DAF683B007E0091 /* AddressBookSyncSource.cpp */; };
61 9173D56212318DE2004CEDB9 /* URLQueryStringParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */; };
62+ 91B441F9123FF86900658AF4 /* logoImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 91B441F7123FF86900658AF4 /* logoImage.png */; };
63+ 91B441FA123FF86900658AF4 /* logoImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 91B441F8123FF86900658AF4 /* logoImage@2x.png */; };
64+ 91B4424D1240045C00658AF4 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 91B4424B1240045C00658AF4 /* Icon.png */; };
65+ 91B4424E1240045C00658AF4 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 91B4424C1240045C00658AF4 /* Icon@2x.png */; };
66 930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6611F9FB8800DD6D06 /* Default.png */; };
67 930D5A6B11F9FB8800DD6D06 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6711F9FB8800DD6D06 /* Default@2x.png */; };
68- 930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6811F9FB8800DD6D06 /* Icon.png */; };
69- 930D5A6D11F9FB8800DD6D06 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6911F9FB8800DD6D06 /* Icon@2x.png */; };
70 935FCDDB12377B5300B5DF9B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 935FCDDA12377B5300B5DF9B /* Security.framework */; };
71 935FCDE512377BAC00B5DF9B /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 935FCDE412377BAC00B5DF9B /* SFHFKeychainUtils.m */; };
72 935FCDFB12377C8B00B5DF9B /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 935FCDFA12377C8B00B5DF9B /* Entitlements.plist */; };
73@@ -69,7 +71,6 @@
74 AB33AAA00E5AE0460098F0A2 /* icon_sync_154x154_frame14.png in Resources */ = {isa = PBXBuildFile; fileRef = AB33AA900E5AE0460098F0A2 /* icon_sync_154x154_frame14.png */; };
75 AB33AAA10E5AE0460098F0A2 /* icon_sync_154x154_frame15.png in Resources */ = {isa = PBXBuildFile; fileRef = AB33AA910E5AE0460098F0A2 /* icon_sync_154x154_frame15.png */; };
76 AB3E86550E08090F00581A6C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB3E86540E08090F00581A6C /* SystemConfiguration.framework */; };
77- AB7C7D050DEC07A100F46ECA /* logoImage.png in Resources */ = {isa = PBXBuildFile; fileRef = AB7C7D040DEC07A100F46ECA /* logoImage.png */; };
78 AB8B508B0DE4384F005B47E4 /* apple-touch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */; };
79 AB926BE60DBCF087008E5FC6 /* AboutView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB926BE50DBCF087008E5FC6 /* AboutView.mm */; };
80 ABAEC2FC11DB5AD100A9D30F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABAEC2FB11DB5AD100A9D30F /* CFNetwork.framework */; };
81@@ -130,7 +131,7 @@
82 /* End PBXContainerItemProxy section */
83
84 /* Begin PBXFileReference section */
85- 1D6058910D05DD3D006BFB54 /* Funambol.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Funambol.app; sourceTree = BUILT_PRODUCTS_DIR; };
86+ 1D6058910D05DD3D006BFB54 /* funambol.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = funambol.app; sourceTree = BUILT_PRODUCTS_DIR; };
87 7C7647BA0DB361EE00786883 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = "<group>"; };
88 7C7647BB0DB361F500786883 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
89 7C849D1F0DB6371200AE7A7D /* iPhoneDefaultConfigFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iPhoneDefaultConfigFactory.h; sourceTree = "<group>"; };
90@@ -160,10 +161,12 @@
91 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
92 9173D4DF123019CC004CEDB9 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; };
93 9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = URLQueryStringParser.mm; sourceTree = "<group>"; };
94+ 91B441F7123FF86900658AF4 /* logoImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logoImage.png; sourceTree = "<group>"; };
95+ 91B441F8123FF86900658AF4 /* logoImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logoImage@2x.png"; sourceTree = "<group>"; };
96+ 91B4424B1240045C00658AF4 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
97+ 91B4424C1240045C00658AF4 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
98 930D5A6611F9FB8800DD6D06 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
99 930D5A6711F9FB8800DD6D06 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
100- 930D5A6811F9FB8800DD6D06 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
101- 930D5A6911F9FB8800DD6D06 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
102 935FCDDA12377B5300B5DF9B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
103 935FCDE312377BA500B5DF9B /* SFHFKeychainUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFHFKeychainUtils.h; sourceTree = "<group>"; };
104 935FCDE412377BAC00B5DF9B /* SFHFKeychainUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFHFKeychainUtils.m; sourceTree = "<group>"; };
105@@ -210,7 +213,6 @@
106 AB33AA900E5AE0460098F0A2 /* icon_sync_154x154_frame14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_sync_154x154_frame14.png; sourceTree = "<group>"; };
107 AB33AA910E5AE0460098F0A2 /* icon_sync_154x154_frame15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_sync_154x154_frame15.png; sourceTree = "<group>"; };
108 AB3E86540E08090F00581A6C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
109- AB7C7D040DEC07A100F46ECA /* logoImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logoImage.png; sourceTree = "<group>"; };
110 AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "apple-touch-icon.png"; sourceTree = "<group>"; };
111 AB926BE40DBCF07B008E5FC6 /* AboutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutView.h; sourceTree = "<group>"; };
112 AB926BE50DBCF087008E5FC6 /* AboutView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AboutView.mm; sourceTree = "<group>"; };
113@@ -272,7 +274,7 @@
114 19C28FACFE9D520D11CA2CBB /* Products */ = {
115 isa = PBXGroup;
116 children = (
117- 1D6058910D05DD3D006BFB54 /* Funambol.app */,
118+ 1D6058910D05DD3D006BFB54 /* funambol.app */,
119 );
120 name = Products;
121 sourceTree = "<group>";
122@@ -295,11 +297,11 @@
123 29B97317FDCFA39411CA2CEA /* Resources */ = {
124 isa = PBXGroup;
125 children = (
126+ 91B4424B1240045C00658AF4 /* Icon.png */,
127+ 91B4424C1240045C00658AF4 /* Icon@2x.png */,
128 935FCDFA12377C8B00B5DF9B /* Entitlements.plist */,
129 930D5A6611F9FB8800DD6D06 /* Default.png */,
130 930D5A6711F9FB8800DD6D06 /* Default@2x.png */,
131- 930D5A6811F9FB8800DD6D06 /* Icon.png */,
132- 930D5A6911F9FB8800DD6D06 /* Icon@2x.png */,
133 ABA164000D9178CF0033F591 /* icons */,
134 8D1107310486CEB800E47090 /* Info.plist */,
135 );
136@@ -386,6 +388,8 @@
137 7C9F57AE0DAF5C50007E0091 /* icons */ = {
138 isa = PBXGroup;
139 children = (
140+ 91B441F7123FF86900658AF4 /* logoImage.png */,
141+ 91B441F8123FF86900658AF4 /* logoImage@2x.png */,
142 93F312B71212AA1700B6FF0D /* u1_sync_button.png */,
143 93F312B81212AA1700B6FF0D /* u1_sync_button@2x.png */,
144 93F312941212A61E00B6FF0D /* bg_pattern.png */,
145@@ -427,7 +431,6 @@
146 ABC5F1D00E24AFF400119787 /* button_onclick.png */,
147 ABC5F1D10E24AFF400119787 /* button_syncing.png */,
148 ABB027A20DF807D600CC4ECD /* icon_cleanup_small.png */,
149- AB7C7D040DEC07A100F46ECA /* logoImage.png */,
150 AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */,
151 ABD7A22A0DD0B95900E97F54 /* poweredby.png */,
152 7C9F57B30DAF5C50007E0091 /* Default.png */,
153@@ -544,7 +547,7 @@
154 );
155 name = funambol;
156 productName = funambol;
157- productReference = 1D6058910D05DD3D006BFB54 /* Funambol.app */;
158+ productReference = 1D6058910D05DD3D006BFB54 /* funambol.app */;
159 productType = "com.apple.product-type.application";
160 };
161 /* End PBXNativeTarget section */
162@@ -628,7 +631,6 @@
163 7C9F58120DAF5C50007E0091 /* worksettings.png in Resources */,
164 ABD7A22B0DD0B95900E97F54 /* poweredby.png in Resources */,
165 AB8B508B0DE4384F005B47E4 /* apple-touch-icon.png in Resources */,
166- AB7C7D050DEC07A100F46ECA /* logoImage.png in Resources */,
167 ABB027A30DF807D600CC4ECD /* icon_cleanup_small.png in Resources */,
168 ABC5F1D20E24AFF400119787 /* button_default.png in Resources */,
169 ABC5F1D30E24AFF400119787 /* button_onclick.png in Resources */,
170@@ -652,8 +654,6 @@
171 ABBF2921104BCE15004A9F09 /* Localizable.strings in Resources */,
172 930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */,
173 930D5A6B11F9FB8800DD6D06 /* Default@2x.png in Resources */,
174- 930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */,
175- 930D5A6D11F9FB8800DD6D06 /* Icon@2x.png in Resources */,
176 93F311DF1212811300B6FF0D /* icon_sync_154x154_frame01@2x.png in Resources */,
177 93F311E01212811300B6FF0D /* icon_sync_154x154_frame02@2x.png in Resources */,
178 93F311E11212811300B6FF0D /* icon_sync_154x154_frame03@2x.png in Resources */,
179@@ -676,6 +676,10 @@
180 93F312B91212AA1700B6FF0D /* u1_sync_button.png in Resources */,
181 93F312BA1212AA1700B6FF0D /* u1_sync_button@2x.png in Resources */,
182 935FCDFB12377C8B00B5DF9B /* Entitlements.plist in Resources */,
183+ 91B441F9123FF86900658AF4 /* logoImage.png in Resources */,
184+ 91B441FA123FF86900658AF4 /* logoImage@2x.png in Resources */,
185+ 91B4424D1240045C00658AF4 /* Icon.png in Resources */,
186+ 91B4424E1240045C00658AF4 /* Icon@2x.png in Resources */,
187 );
188 runOnlyForDeploymentPostprocessing = 0;
189 };
190@@ -985,7 +989,8 @@
191 isa = XCBuildConfiguration;
192 buildSettings = {
193 ALWAYS_SEARCH_USER_PATHS = NO;
194- CODE_SIGN_ENTITLEMENTS = dist.plist;
195+ CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
196+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Canonical Group Limited";
197 COPY_PHASE_STRIP = YES;
198 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
199 FRAMEWORK_SEARCH_PATHS = "";
200@@ -1022,6 +1027,7 @@
201 );
202 PREBINDING = NO;
203 PRODUCT_NAME = funambol;
204+ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "615208E5-416A-4637-A746-45FB06299017";
205 SDKROOT = iphoneos4.1;
206 TARGETED_DEVICE_FAMILY = 1;
207 WRAPPER_EXTENSION = app;
208
209=== removed file 'contacts/iPhoneApp/icon.png'
210Binary 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
211=== removed file 'contacts/iPhoneApp/icon@2x.png'
212Binary files contacts/iPhoneApp/icon@2x.png 2010-08-24 20:32:41 +0000 and contacts/iPhoneApp/icon@2x.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: