iOS / asi-http-request

Go to a project
Toggle navigation Toggle navigation pinning
Ben Copsey
d001857f 1 parent 652a3a76

Fix naughty find and replace crapsplosion

Inline Side-by-side
Showing 3 changed files with 48 additions and 425 deletions
@@ -192,13 +192,13 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy @@ -192,13 +192,13 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
192 } 192 }
193 193
194 //Adds files to upload 194 //Adds files to upload
195 - NSData *contentBlueprintHeader = [[NSString stringWithString:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]; 195 + NSData *contentTypeHeader = [[NSString stringWithString:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding];
196 e = [fileData keyEnumerator]; 196 e = [fileData keyEnumerator];
197 i=0; 197 i=0;
198 while (key = [e nextObject]) { 198 while (key = [e nextObject]) {
199 NSString *filePath = [fileData objectForKey:key]; 199 NSString *filePath = [fileData objectForKey:key];
200 [postBody appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",key,[filePath lastPathComponent]] dataUsingEncoding:NSUTF8StringEncoding]]; 200 [postBody appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",key,[filePath lastPathComponent]] dataUsingEncoding:NSUTF8StringEncoding]];
201 - [postBody appendData:contentBlueprintHeader]; 201 + [postBody appendData:contentTypeHeader];
202 [postBody appendData:[NSData dataWithContentsOfMappedFile:filePath]]; 202 [postBody appendData:[NSData dataWithContentsOfMappedFile:filePath]];
203 i++; 203 i++;
204 if (i != [fileData count]) { //Only add the boundary if this is not the last item in the post body 204 if (i != [fileData count]) { //Only add the boundary if this is not the last item in the post body
@@ -334,7 +334,7 @@ @@ -334,7 +334,7 @@
334 <key>_historyCapacity</key> 334 <key>_historyCapacity</key>
335 <integer>0</integer> 335 <integer>0</integer>
336 <key>bookmark</key> 336 <key>bookmark</key>
337 - <string>B567EF2F0E4EDC06001E238F</string> 337 + <string>B567EF390E4EDE4A001E238F</string>
338 <key>history</key> 338 <key>history</key>
339 <array> 339 <array>
340 <string>B5731B8B0E4310180008024F</string> 340 <string>B5731B8B0E4310180008024F</string>
@@ -570,11 +570,12 @@ @@ -570,11 +570,12 @@
570 <integer>5</integer> 570 <integer>5</integer>
571 <key>WindowOrderList</key> 571 <key>WindowOrderList</key>
572 <array> 572 <array>
  573 + <string>1C530D57069F1CE1000CFCEE</string>
573 <string>B567EF0F0E4EDB31001E238F</string> 574 <string>B567EF0F0E4EDB31001E238F</string>
574 <string>B567EF100E4EDB31001E238F</string> 575 <string>B567EF100E4EDB31001E238F</string>
575 <string>B5ABC8410E24CDE70072F422</string> 576 <string>B5ABC8410E24CDE70072F422</string>
576 - <string>1CD10A99069EF8BA00B06720</string>  
577 <string>1C78EAAD065D492600B07095</string> 577 <string>1C78EAAD065D492600B07095</string>
  578 + <string>1CD10A99069EF8BA00B06720</string>
578 <string>/Users/ben/asi-http-request/asi-http-request.xcodeproj</string> 579 <string>/Users/ben/asi-http-request/asi-http-request.xcodeproj</string>
579 </array> 580 </array>
580 <key>WindowString</key> 581 <key>WindowString</key>
@@ -810,14 +811,12 @@ @@ -810,14 +811,12 @@
810 <key>Dock</key> 811 <key>Dock</key>
811 <array> 812 <array>
812 <dict> 813 <dict>
813 - <key>BecomeActive</key>  
814 - <true/>  
815 <key>ContentConfiguration</key> 814 <key>ContentConfiguration</key>
816 <dict> 815 <dict>
817 <key>PBXProjectModuleGUID</key> 816 <key>PBXProjectModuleGUID</key>
818 <string>1CDD528C0622207200134675</string> 817 <string>1CDD528C0622207200134675</string>
819 <key>PBXProjectModuleLabel</key> 818 <key>PBXProjectModuleLabel</key>
820 - <string>ASIHTTPRequest.m</string> 819 + <string></string>
821 <key>StatusBarVisibility</key> 820 <key>StatusBarVisibility</key>
822 <true/> 821 <true/>
823 </dict> 822 </dict>
@@ -838,6 +837,8 @@ @@ -838,6 +837,8 @@
838 <string>212pt</string> 837 <string>212pt</string>
839 </dict> 838 </dict>
840 <dict> 839 <dict>
  840 + <key>BecomeActive</key>
  841 + <true/>
841 <key>ContentConfiguration</key> 842 <key>ContentConfiguration</key>
842 <dict> 843 <dict>
843 <key>PBXProjectModuleGUID</key> 844 <key>PBXProjectModuleGUID</key>
@@ -873,8 +874,8 @@ @@ -873,8 +874,8 @@
873 <key>TableOfContents</key> 874 <key>TableOfContents</key>
874 <array> 875 <array>
875 <string>1C530D57069F1CE1000CFCEE</string> 876 <string>1C530D57069F1CE1000CFCEE</string>
876 - <string>B50FD7100E3B83F3003CEB08</string> 877 + <string>B567EF350E4EDE05001E238F</string>
877 - <string>B50FD7110E3B83F3003CEB08</string> 878 + <string>B567EF360E4EDE05001E238F</string>
878 <string>1CDD528C0622207200134675</string> 879 <string>1CDD528C0622207200134675</string>
879 <string>1CD0528E0623707200166675</string> 880 <string>1CD0528E0623707200166675</string>
880 </array> 881 </array>
@@ -131,79 +131,44 @@ @@ -131,79 +131,44 @@
131 PBXWorkspaceStateSaveDate = 240048315; 131 PBXWorkspaceStateSaveDate = 240048315;
132 }; 132 };
133 perUserProjectItems = { 133 perUserProjectItems = {
134 - B513D4020E2BD48A000A50C6 = B513D4020E2BD48A000A50C6 /* PlistBookmark */; 134 + B513D4020E2BD48A000A50C6 /* PlistBookmark */ = B513D4020E2BD48A000A50C6 /* PlistBookmark */;
135 - B513D4030E2BD48A000A50C6 = B513D4030E2BD48A000A50C6 /* PBXTextBookmark */; 135 + B513D4030E2BD48A000A50C6 /* PBXTextBookmark */ = B513D4030E2BD48A000A50C6 /* PBXTextBookmark */;
136 - B567EEE10E4ED8D2001E238F /* PBXTextBookmark */ = B567EEE10E4ED8D2001E238F /* PBXTextBookmark */;  
137 - B567EEEE0E4EDA82001E238F /* PBXTextBookmark */ = B567EEEE0E4EDA82001E238F /* PBXTextBookmark */;  
138 - B567EEEF0E4EDA82001E238F /* PBXTextBookmark */ = B567EEEF0E4EDA82001E238F /* PBXTextBookmark */;  
139 B567EEF10E4EDA85001E238F /* PBXTextBookmark */ = B567EEF10E4EDA85001E238F /* PBXTextBookmark */; 136 B567EEF10E4EDA85001E238F /* PBXTextBookmark */ = B567EEF10E4EDA85001E238F /* PBXTextBookmark */;
140 - B567EEF20E4EDA85001E238F /* PBXTextBookmark */ = B567EEF20E4EDA85001E238F /* PBXTextBookmark */;  
141 - B567EEF30E4EDA85001E238F /* PBXTextBookmark */ = B567EEF30E4EDA85001E238F /* PBXTextBookmark */;  
142 B567EEF40E4EDA85001E238F /* PBXTextBookmark */ = B567EEF40E4EDA85001E238F /* PBXTextBookmark */; 137 B567EEF40E4EDA85001E238F /* PBXTextBookmark */ = B567EEF40E4EDA85001E238F /* PBXTextBookmark */;
143 B567EEF50E4EDA85001E238F /* PBXTextBookmark */ = B567EEF50E4EDA85001E238F /* PBXTextBookmark */; 138 B567EEF50E4EDA85001E238F /* PBXTextBookmark */ = B567EEF50E4EDA85001E238F /* PBXTextBookmark */;
144 B567EEF60E4EDA85001E238F /* PBXTextBookmark */ = B567EEF60E4EDA85001E238F /* PBXTextBookmark */; 139 B567EEF60E4EDA85001E238F /* PBXTextBookmark */ = B567EEF60E4EDA85001E238F /* PBXTextBookmark */;
145 B567EEF70E4EDA85001E238F /* PBXTextBookmark */ = B567EEF70E4EDA85001E238F /* PBXTextBookmark */; 140 B567EEF70E4EDA85001E238F /* PBXTextBookmark */ = B567EEF70E4EDA85001E238F /* PBXTextBookmark */;
146 B567EEF80E4EDA85001E238F /* PBXTextBookmark */ = B567EEF80E4EDA85001E238F /* PBXTextBookmark */; 141 B567EEF80E4EDA85001E238F /* PBXTextBookmark */ = B567EEF80E4EDA85001E238F /* PBXTextBookmark */;
147 B567EEF90E4EDA85001E238F /* PBXTextBookmark */ = B567EEF90E4EDA85001E238F /* PBXTextBookmark */; 142 B567EEF90E4EDA85001E238F /* PBXTextBookmark */ = B567EEF90E4EDA85001E238F /* PBXTextBookmark */;
148 - B567EEFA0E4EDA85001E238F /* PBXTextBookmark */ = B567EEFA0E4EDA85001E238F /* PBXTextBookmark */;  
149 - B567EEFC0E4EDA95001E238F /* PBXTextBookmark */ = B567EEFC0E4EDA95001E238F /* PBXTextBookmark */;  
150 - B567EF0D0E4EDB31001E238F /* PBXTextBookmark */ = B567EF0D0E4EDB31001E238F /* PBXTextBookmark */;  
151 B567EF140E4EDB3D001E238F /* PBXTextBookmark */ = B567EF140E4EDB3D001E238F /* PBXTextBookmark */; 143 B567EF140E4EDB3D001E238F /* PBXTextBookmark */ = B567EF140E4EDB3D001E238F /* PBXTextBookmark */;
152 - B567EF150E4EDB3D001E238F /* PBXTextBookmark */ = B567EF150E4EDB3D001E238F /* PBXTextBookmark */;  
153 B567EF160E4EDB3D001E238F /* PBXTextBookmark */ = B567EF160E4EDB3D001E238F /* PBXTextBookmark */; 144 B567EF160E4EDB3D001E238F /* PBXTextBookmark */ = B567EF160E4EDB3D001E238F /* PBXTextBookmark */;
154 - B567EF170E4EDB3D001E238F /* PBXTextBookmark */ = B567EF170E4EDB3D001E238F /* PBXTextBookmark */;  
155 - B567EF230E4EDBA2001E238F /* PBXTextBookmark */ = B567EF230E4EDBA2001E238F /* PBXTextBookmark */;  
156 - B567EF290E4EDBC5001E238F /* PBXTextBookmark */ = B567EF290E4EDBC5001E238F /* PBXTextBookmark */;  
157 B567EF2B0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2B0E4EDC06001E238F /* PBXTextBookmark */; 145 B567EF2B0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2B0E4EDC06001E238F /* PBXTextBookmark */;
158 B567EF2C0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2C0E4EDC06001E238F /* PBXTextBookmark */; 146 B567EF2C0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2C0E4EDC06001E238F /* PBXTextBookmark */;
159 B567EF2D0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2D0E4EDC06001E238F /* PBXTextBookmark */; 147 B567EF2D0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2D0E4EDC06001E238F /* PBXTextBookmark */;
160 B567EF2E0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2E0E4EDC06001E238F /* PBXTextBookmark */; 148 B567EF2E0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2E0E4EDC06001E238F /* PBXTextBookmark */;
161 - B567EF2F0E4EDC06001E238F /* PBXTextBookmark */ = B567EF2F0E4EDC06001E238F /* PBXTextBookmark */; 149 + B567EF390E4EDE4A001E238F /* PBXTextBookmark */ = B567EF390E4EDE4A001E238F /* PBXTextBookmark */;
162 - B5731B390E430D310008024F = B5731B390E430D310008024F /* PBXTextBookmark */; 150 + B5731B390E430D310008024F /* PBXTextBookmark */ = B5731B390E430D310008024F /* PBXTextBookmark */;
163 - B5731B3A0E430D310008024F = B5731B3A0E430D310008024F /* PBXTextBookmark */; 151 + B5731B3A0E430D310008024F /* PBXTextBookmark */ = B5731B3A0E430D310008024F /* PBXTextBookmark */;
164 - B5731B8B0E4310180008024F = B5731B8B0E4310180008024F /* PBXTextBookmark */; 152 + B5731B8B0E4310180008024F /* PBXTextBookmark */ = B5731B8B0E4310180008024F /* PBXTextBookmark */;
165 - B5731B8F0E4310180008024F = B5731B8F0E4310180008024F /* PBXTextBookmark */; 153 + B5731B8F0E4310180008024F /* PBXTextBookmark */ = B5731B8F0E4310180008024F /* PBXTextBookmark */;
166 - B5731BBE0E4319180008024F = B5731BBE0E4319180008024F /* PBXTextBookmark */; 154 + B5731BBE0E4319180008024F /* PBXTextBookmark */ = B5731BBE0E4319180008024F /* PBXTextBookmark */;
167 - B5731BC00E4319180008024F = B5731BC00E4319180008024F /* PBXTextBookmark */; 155 + B5731BC00E4319180008024F /* PBXTextBookmark */ = B5731BC00E4319180008024F /* PBXTextBookmark */;
168 - B5731BEE0E431A050008024F = B5731BEE0E431A050008024F /* PBXTextBookmark */; 156 + B5731BEE0E431A050008024F /* PBXTextBookmark */ = B5731BEE0E431A050008024F /* PBXTextBookmark */;
169 - B5731BEF0E431A050008024F = B5731BEF0E431A050008024F /* PlistBookmark */; 157 + B5731BEF0E431A050008024F /* PlistBookmark */ = B5731BEF0E431A050008024F /* PlistBookmark */;
170 - B5731BF00E431A050008024F = B5731BF00E431A050008024F /* PBXTextBookmark */; 158 + B5731BF00E431A050008024F /* PBXTextBookmark */ = B5731BF00E431A050008024F /* PBXTextBookmark */;
171 - B5731BF60E431A050008024F = B5731BF60E431A050008024F /* PBXTextBookmark */; 159 + B5731BF60E431A050008024F /* PBXTextBookmark */ = B5731BF60E431A050008024F /* PBXTextBookmark */;
172 - B5731D9B0E433A750008024F = B5731D9B0E433A750008024F /* PBXTextBookmark */; 160 + B5731D9B0E433A750008024F /* PBXTextBookmark */ = B5731D9B0E433A750008024F /* PBXTextBookmark */;
173 - B5731E180E43424A0008024F = B5731E180E43424A0008024F /* PBXTextBookmark */; 161 + B5731E180E43424A0008024F /* PBXTextBookmark */ = B5731E180E43424A0008024F /* PBXTextBookmark */;
174 - B5731E330E4344F90008024F = B5731E330E4344F90008024F /* PBXTextBookmark */; 162 + B5731E330E4344F90008024F /* PBXTextBookmark */ = B5731E330E4344F90008024F /* PBXTextBookmark */;
175 - B5731E550E435ADB0008024F = B5731E550E435ADB0008024F /* PBXTextBookmark */; 163 + B5731E550E435ADB0008024F /* PBXTextBookmark */ = B5731E550E435ADB0008024F /* PBXTextBookmark */;
176 - B5ABC8250E24CDE70072F422 = B5ABC8250E24CDE70072F422 /* PBXTextBookmark */; 164 + B5ABC8250E24CDE70072F422 /* PBXTextBookmark */ = B5ABC8250E24CDE70072F422 /* PBXTextBookmark */;
177 - B5ABC8260E24CDE70072F422 = B5ABC8260E24CDE70072F422 /* PBXTextBookmark */; 165 + B5ABC8260E24CDE70072F422 /* PBXTextBookmark */ = B5ABC8260E24CDE70072F422 /* PBXTextBookmark */;
178 - B5ABC8280E24CDE70072F422 = B5ABC8280E24CDE70072F422 /* PBXTextBookmark */; 166 + B5ABC8280E24CDE70072F422 /* PBXTextBookmark */ = B5ABC8280E24CDE70072F422 /* PBXTextBookmark */;
179 - B5ABC82F0E24CDE70072F422 = B5ABC82F0E24CDE70072F422 /* PBXTextBookmark */; 167 + B5ABC82F0E24CDE70072F422 /* PBXTextBookmark */ = B5ABC82F0E24CDE70072F422 /* PBXTextBookmark */;
180 - B5ABC8300E24CDE70072F422 = B5ABC8300E24CDE70072F422 /* PBXTextBookmark */; 168 + B5ABC8300E24CDE70072F422 /* PBXTextBookmark */ = B5ABC8300E24CDE70072F422 /* PBXTextBookmark */;
181 - B5F3B7200E4367CA00E001FD = B5F3B7200E4367CA00E001FD /* PBXTextBookmark */; 169 + B5F3B7370E43683600E001FD /* PBXTextBookmark */ = B5F3B7370E43683600E001FD /* PBXTextBookmark */;
182 - B5F3B7210E4367CA00E001FD = B5F3B7210E4367CA00E001FD /* PBXTextBookmark */; 170 + B5F3B7390E43683600E001FD /* PBXTextBookmark */ = B5F3B7390E43683600E001FD /* PBXTextBookmark */;
183 - B5F3B7220E4367CA00E001FD = B5F3B7220E4367CA00E001FD /* PBXTextBookmark */; 171 + B5F3B74C0E4378FA00E001FD /* PBXTextBookmark */ = B5F3B74C0E4378FA00E001FD /* PBXTextBookmark */;
184 - B5F3B7230E4367CA00E001FD = B5F3B7230E4367CA00E001FD /* PBXTextBookmark */;  
185 - B5F3B7240E4367CA00E001FD = B5F3B7240E4367CA00E001FD /* PBXTextBookmark */;  
186 - B5F3B7250E4367CA00E001FD = B5F3B7250E4367CA00E001FD /* PBXTextBookmark */;  
187 - B5F3B7260E4367CA00E001FD = B5F3B7260E4367CA00E001FD /* PBXTextBookmark */;  
188 - B5F3B7270E4367CA00E001FD = B5F3B7270E4367CA00E001FD /* PBXTextBookmark */;  
189 - B5F3B7280E4367CA00E001FD = B5F3B7280E4367CA00E001FD /* PBXTextBookmark */;  
190 - B5F3B7290E4367CA00E001FD = B5F3B7290E4367CA00E001FD /* PBXTextBookmark */;  
191 - B5F3B7370E43683600E001FD = B5F3B7370E43683600E001FD /* PBXTextBookmark */;  
192 - B5F3B7380E43683600E001FD = B5F3B7380E43683600E001FD /* PBXTextBookmark */;  
193 - B5F3B7390E43683600E001FD = B5F3B7390E43683600E001FD /* PBXTextBookmark */;  
194 - B5F3B73A0E43683600E001FD = B5F3B73A0E43683600E001FD /* PBXTextBookmark */;  
195 - B5F3B7460E43698300E001FD = B5F3B7460E43698300E001FD /* PBXTextBookmark */;  
196 - B5F3B7470E43698300E001FD = B5F3B7470E43698300E001FD /* PBXTextBookmark */;  
197 - B5F3B7480E43698300E001FD = B5F3B7480E43698300E001FD /* PBXTextBookmark */;  
198 - B5F3B74A0E4378FA00E001FD = B5F3B74A0E4378FA00E001FD /* PBXTextBookmark */;  
199 - B5F3B74B0E4378FA00E001FD = B5F3B74B0E4378FA00E001FD /* PBXTextBookmark */;  
200 - B5F3B74C0E4378FA00E001FD = B5F3B74C0E4378FA00E001FD /* PBXTextBookmark */;  
201 - B5F3B74D0E4378FA00E001FD = B5F3B74D0E4378FA00E001FD /* PBXTextBookmark */;  
202 - B5F3B74E0E4378FA00E001FD = B5F3B74E0E4378FA00E001FD /* PBXTextBookmark */;  
203 - B5F3B74F0E4378FA00E001FD = B5F3B74F0E4378FA00E001FD /* PBXTextBookmark */;  
204 - B5F3B7500E4378FA00E001FD = B5F3B7500E4378FA00E001FD /* PBXTextBookmark */;  
205 - B5F3B7510E4378FA00E001FD = B5F3B7510E4378FA00E001FD /* PBXTextBookmark */;  
206 - B5F3B7520E4378FA00E001FD = B5F3B7520E4378FA00E001FD /* PBXTextBookmark */;  
207 }; 172 };
208 sourceControlManager = B5ABC7B50E24C52A0072F422 /* Source Control */; 173 sourceControlManager = B5ABC7B50E24C52A0072F422 /* Source Control */;
209 userBuildSettings = { 174 userBuildSettings = {
@@ -243,34 +208,6 @@ @@ -243,34 +208,6 @@
243 vrLen = 100; 208 vrLen = 100;
244 vrLoc = 0; 209 vrLoc = 0;
245 }; 210 };
246 - B567EEE10E4ED8D2001E238F /* PBXTextBookmark */ = {  
247 - isa = PBXTextBookmark;  
248 - fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;  
249 - name = "AppDelegate.m: 157";  
250 - rLen = 0;  
251 - rLoc = 5256;  
252 - rType = 0;  
253 - vrLen = 2133;  
254 - vrLoc = 1170;  
255 - };  
256 - B567EEEE0E4EDA82001E238F /* PBXTextBookmark */ = {  
257 - isa = PBXTextBookmark;  
258 - comments = "warning: property 'username' requires method '-username' to be defined - use @synthesize, @dynamic or provide a method implementation";  
259 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
260 - rLen = 1;  
261 - rLoc = 790;  
262 - rType = 1;  
263 - };  
264 - B567EEEF0E4EDA82001E238F /* PBXTextBookmark */ = {  
265 - isa = PBXTextBookmark;  
266 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
267 - name = "ASIHTTPRequest.m: 775";  
268 - rLen = 0;  
269 - rLoc = 24996;  
270 - rType = 0;  
271 - vrLen = 959;  
272 - vrLoc = 24386;  
273 - };  
274 B567EEF10E4EDA85001E238F /* PBXTextBookmark */ = { 211 B567EEF10E4EDA85001E238F /* PBXTextBookmark */ = {
275 isa = PBXTextBookmark; 212 isa = PBXTextBookmark;
276 fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */; 213 fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;
@@ -281,24 +218,6 @@ @@ -281,24 +218,6 @@
281 vrLen = 1170; 218 vrLen = 1170;
282 vrLoc = 0; 219 vrLoc = 0;
283 }; 220 };
284 - B567EEF20E4EDA85001E238F /* PBXTextBookmark */ = {  
285 - isa = PBXTextBookmark;  
286 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
287 - name = "ASIHTTPRequest.h: 133";  
288 - rLen = 0;  
289 - rLoc = 4343;  
290 - rType = 0;  
291 - vrLen = 1375;  
292 - vrLoc = 3985;  
293 - };  
294 - B567EEF30E4EDA85001E238F /* PBXTextBookmark */ = {  
295 - isa = PBXTextBookmark;  
296 - comments = "warning: assignment from incompatible pointer type";  
297 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
298 - rLen = 0;  
299 - rLoc = 469;  
300 - rType = 1;  
301 - };  
302 B567EEF40E4EDA85001E238F /* PBXTextBookmark */ = { 221 B567EEF40E4EDA85001E238F /* PBXTextBookmark */ = {
303 isa = PBXTextBookmark; 222 isa = PBXTextBookmark;
304 fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */; 223 fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;
@@ -344,7 +263,7 @@ @@ -344,7 +263,7 @@
344 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */; 263 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;
345 name = "ASIHTTPRequest.m: 480"; 264 name = "ASIHTTPRequest.m: 480";
346 rLen = 0; 265 rLen = 0;
347 - rLoc = 15647; 266 + rLoc = 15637;
348 rType = 0; 267 rType = 0;
349 vrLen = 1694; 268 vrLen = 1694;
350 vrLoc = 15428; 269 vrLoc = 15428;
@@ -359,93 +278,26 @@ @@ -359,93 +278,26 @@
359 vrLen = 1375; 278 vrLen = 1375;
360 vrLoc = 3985; 279 vrLoc = 3985;
361 }; 280 };
362 - B567EEFA0E4EDA85001E238F /* PBXTextBookmark */ = {  
363 - isa = PBXTextBookmark;  
364 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
365 - name = "ASIHTTPRequest.m: 470";  
366 - rLen = 0;  
367 - rLoc = 15647;  
368 - rType = 0;  
369 - vrLen = 1381;  
370 - vrLoc = 14831;  
371 - };  
372 - B567EEFC0E4EDA95001E238F /* PBXTextBookmark */ = {  
373 - isa = PBXTextBookmark;  
374 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
375 - name = "ASIHTTPRequest.m: 471";  
376 - rLen = 0;  
377 - rLoc = 15702;  
378 - rType = 0;  
379 - vrLen = 1393;  
380 - vrLoc = 14831;  
381 - };  
382 - B567EF0D0E4EDB31001E238F /* PBXTextBookmark */ = {  
383 - isa = PBXTextBookmark;  
384 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
385 - name = "ASIHTTPRequest.m: 472";  
386 - rLen = 0;  
387 - rLoc = 15741;  
388 - rType = 0;  
389 - vrLen = 1558;  
390 - vrLoc = 15168;  
391 - };  
392 B567EF140E4EDB3D001E238F /* PBXTextBookmark */ = { 281 B567EF140E4EDB3D001E238F /* PBXTextBookmark */ = {
393 isa = PBXTextBookmark; 282 isa = PBXTextBookmark;
394 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */; 283 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;
395 name = "ASIHTTPRequest.m: 472"; 284 name = "ASIHTTPRequest.m: 472";
396 rLen = 0; 285 rLen = 0;
397 - rLoc = 15741; 286 + rLoc = 15731;
398 rType = 0; 287 rType = 0;
399 vrLen = 1558; 288 vrLen = 1558;
400 vrLoc = 15168; 289 vrLoc = 15168;
401 }; 290 };
402 - B567EF150E4EDB3D001E238F /* PBXTextBookmark */ = {  
403 - isa = PBXTextBookmark;  
404 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
405 - rLen = 0;  
406 - rLoc = 89;  
407 - rType = 1;  
408 - };  
409 B567EF160E4EDB3D001E238F /* PBXTextBookmark */ = { 291 B567EF160E4EDB3D001E238F /* PBXTextBookmark */ = {
410 isa = PBXTextBookmark; 292 isa = PBXTextBookmark;
411 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */; 293 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;
412 name = "ASIHTTPRequest.m: 472"; 294 name = "ASIHTTPRequest.m: 472";
413 rLen = 0; 295 rLen = 0;
414 - rLoc = 15741; 296 + rLoc = 15731;
415 rType = 0; 297 rType = 0;
416 vrLen = 1558; 298 vrLen = 1558;
417 vrLoc = 15168; 299 vrLoc = 15168;
418 }; 300 };
419 - B567EF170E4EDB3D001E238F /* PBXTextBookmark */ = {  
420 - isa = PBXTextBookmark;  
421 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
422 - name = "ASIHTTPRequestTests.m: 90";  
423 - rLen = 0;  
424 - rLoc = 3346;  
425 - rType = 0;  
426 - vrLen = 1951;  
427 - vrLoc = 2351;  
428 - };  
429 - B567EF230E4EDBA2001E238F /* PBXTextBookmark */ = {  
430 - isa = PBXTextBookmark;  
431 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
432 - name = "ASIHTTPRequestTests.m: 89";  
433 - rLen = 0;  
434 - rLoc = 3345;  
435 - rType = 0;  
436 - vrLen = 1917;  
437 - vrLoc = 2007;  
438 - };  
439 - B567EF290E4EDBC5001E238F /* PBXTextBookmark */ = {  
440 - isa = PBXTextBookmark;  
441 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
442 - name = "ASIHTTPRequestTests.m: 89";  
443 - rLen = 0;  
444 - rLoc = 3345;  
445 - rType = 0;  
446 - vrLen = 1917;  
447 - vrLoc = 2007;  
448 - };  
449 B567EF2B0E4EDC06001E238F /* PBXTextBookmark */ = { 301 B567EF2B0E4EDC06001E238F /* PBXTextBookmark */ = {
450 isa = PBXTextBookmark; 302 isa = PBXTextBookmark;
451 fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */; 303 fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;
@@ -486,15 +338,15 @@ @@ -486,15 +338,15 @@
486 vrLen = 1823; 338 vrLen = 1823;
487 vrLoc = 1211; 339 vrLoc = 1211;
488 }; 340 };
489 - B567EF2F0E4EDC06001E238F /* PBXTextBookmark */ = { 341 + B567EF390E4EDE4A001E238F /* PBXTextBookmark */ = {
490 isa = PBXTextBookmark; 342 isa = PBXTextBookmark;
491 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */; 343 fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;
492 - name = "ASIHTTPRequest.m: 212"; 344 + name = "ASIHTTPRequest.m: 670";
493 rLen = 0; 345 rLen = 0;
494 - rLoc = 6701; 346 + rLoc = 21723;
495 rType = 0; 347 rType = 0;
496 - vrLen = 1896; 348 + vrLen = 1299;
497 - vrLoc = 3053; 349 + vrLoc = 20869;
498 }; 350 };
499 B5731AE50E430AC30008024F /* Tests */ = { 351 B5731AE50E430AC30008024F /* Tests */ = {
500 activeExec = 0; 352 activeExec = 0;
@@ -508,9 +360,9 @@ @@ -508,9 +360,9 @@
508 }; 360 };
509 B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */ = { 361 B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */ = {
510 uiCtxt = { 362 uiCtxt = {
511 - sepNavIntBoundsRect = "{{0, 0}, {947, 1666}}"; 363 + sepNavIntBoundsRect = "{{0, 0}, {1379, 1624}}";
512 sepNavSelRange = "{3345, 0}"; 364 sepNavSelRange = "{3345, 0}";
513 - sepNavVisRange = "{1333, 2058}"; 365 + sepNavVisRange = "{2353, 1753}";
514 }; 366 };
515 }; 367 };
516 B5731B390E430D310008024F /* PBXTextBookmark */ = { 368 B5731B390E430D310008024F /* PBXTextBookmark */ = {
@@ -756,9 +608,9 @@ @@ -756,9 +608,9 @@
756 }; 608 };
757 B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */ = { 609 B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */ = {
758 uiCtxt = { 610 uiCtxt = {
759 - sepNavIntBoundsRect = "{{0, 0}, {1680, 10878}}"; 611 + sepNavIntBoundsRect = "{{0, 0}, {1680, 11074}}";
760 - sepNavSelRange = "{6701, 0}"; 612 + sepNavSelRange = "{21723, 0}";
761 - sepNavVisRange = "{3053, 1896}"; 613 + sepNavVisRange = "{20869, 1299}";
762 sepNavWindowFrame = "{{500, 55}, {1475, 874}}"; 614 sepNavWindowFrame = "{{500, 55}, {1475, 874}}";
763 }; 615 };
764 }; 616 };
@@ -843,106 +695,6 @@ @@ -843,106 +695,6 @@
843 vrLen = 281; 695 vrLen = 281;
844 vrLoc = 0; 696 vrLoc = 0;
845 }; 697 };
846 - B5F3B7200E4367CA00E001FD /* PBXTextBookmark */ = {  
847 - isa = PBXTextBookmark;  
848 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
849 - name = "ASIHTTPRequest.h: 203";  
850 - rLen = 648;  
851 - rLoc = 6758;  
852 - rType = 0;  
853 - vrLen = 1722;  
854 - vrLoc = 335;  
855 - };  
856 - B5F3B7210E4367CA00E001FD /* PBXTextBookmark */ = {  
857 - isa = PBXTextBookmark;  
858 - fRef = B5ABC80D0E24CB100072F422 /* AppDelegate.h */;  
859 - name = "AppDelegate.h: 4";  
860 - rLen = 0;  
861 - rLoc = 42;  
862 - rType = 0;  
863 - vrLen = 1083;  
864 - vrLoc = 0;  
865 - };  
866 - B5F3B7220E4367CA00E001FD /* PBXTextBookmark */ = {  
867 - isa = PBXTextBookmark;  
868 - fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;  
869 - name = "AppDelegate.m: 46";  
870 - rLen = 27;  
871 - rLoc = 1048;  
872 - rType = 0;  
873 - vrLen = 1255;  
874 - vrLoc = 3421;  
875 - };  
876 - B5F3B7230E4367CA00E001FD /* PBXTextBookmark */ = {  
877 - isa = PBXTextBookmark;  
878 - fRef = B5ABC80D0E24CB100072F422 /* AppDelegate.h */;  
879 - name = "AppDelegate.h: 4";  
880 - rLen = 0;  
881 - rLoc = 42;  
882 - rType = 0;  
883 - vrLen = 1083;  
884 - vrLoc = 0;  
885 - };  
886 - B5F3B7240E4367CA00E001FD /* PBXTextBookmark */ = {  
887 - isa = PBXTextBookmark;  
888 - fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;  
889 - name = "AppDelegate.m: 46";  
890 - rLen = 27;  
891 - rLoc = 1048;  
892 - rType = 0;  
893 - vrLen = 1719;  
894 - vrLoc = 4330;  
895 - };  
896 - B5F3B7250E4367CA00E001FD /* PBXTextBookmark */ = {  
897 - isa = PBXTextBookmark;  
898 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
899 - name = "ASIHTTPRequestTests.m: 86";  
900 - rLen = 0;  
901 - rLoc = 3291;  
902 - rType = 0;  
903 - vrLen = 1408;  
904 - vrLoc = 0;  
905 - };  
906 - B5F3B7260E4367CA00E001FD /* PBXTextBookmark */ = {  
907 - isa = PBXTextBookmark;  
908 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
909 - name = "ASIHTTPRequest.h: 231";  
910 - rLen = 0;  
911 - rLoc = 8264;  
912 - rType = 0;  
913 - vrLen = 1817;  
914 - vrLoc = 6342;  
915 - };  
916 - B5F3B7270E4367CA00E001FD /* PBXTextBookmark */ = {  
917 - isa = PBXTextBookmark;  
918 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
919 - name = "ASIHTTPRequest.m: 661";  
920 - rLen = 0;  
921 - rLoc = 21456;  
922 - rType = 0;  
923 - vrLen = 1216;  
924 - vrLoc = 20414;  
925 - };  
926 - B5F3B7280E4367CA00E001FD /* PBXTextBookmark */ = {  
927 - isa = PBXTextBookmark;  
928 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
929 - name = "ASIHTTPRequest.h: 46";  
930 - rLen = 6;  
931 - rLoc = 1731;  
932 - rType = 0;  
933 - vrLen = 1946;  
934 - vrLoc = 599;  
935 - };  
936 - B5F3B7290E4367CA00E001FD /* PBXTextBookmark */ = {  
937 - isa = PBXTextBookmark;  
938 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
939 - name = "ASIHTTPRequest.m: 780";  
940 - rLen = 9;  
941 - rLoc = 25155;  
942 - rType = 0;  
943 - vrLen = 1554;  
944 - vrLoc = 23304;  
945 - };  
946 B5F3B72B0E4367CA00E001FD /* TimelineViewSelectionManagement.m */ = { 698 B5F3B72B0E4367CA00E001FD /* TimelineViewSelectionManagement.m */ = {
947 isa = PBXFileReference; 699 isa = PBXFileReference;
948 lastKnownFileType = sourcecode.c.objc; 700 lastKnownFileType = sourcecode.c.objc;
@@ -960,16 +712,6 @@ @@ -960,16 +712,6 @@
960 vrLen = 943; 712 vrLen = 943;
961 vrLoc = 0; 713 vrLoc = 0;
962 }; 714 };
963 - B5F3B7380E43683600E001FD /* PBXTextBookmark */ = {  
964 - isa = PBXTextBookmark;  
965 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
966 - name = "ASIHTTPRequestTests.m: 86";  
967 - rLen = 0;  
968 - rLoc = 3291;  
969 - rType = 0;  
970 - vrLen = 1408;  
971 - vrLoc = 0;  
972 - };  
973 B5F3B7390E43683600E001FD /* PBXTextBookmark */ = { 715 B5F3B7390E43683600E001FD /* PBXTextBookmark */ = {
974 isa = PBXTextBookmark; 716 isa = PBXTextBookmark;
975 fRef = B5F3B72B0E4367CA00E001FD /* TimelineViewSelectionManagement.m */; 717 fRef = B5F3B72B0E4367CA00E001FD /* TimelineViewSelectionManagement.m */;
@@ -980,66 +722,6 @@ @@ -980,66 +722,6 @@
980 vrLen = 943; 722 vrLen = 943;
981 vrLoc = 0; 723 vrLoc = 0;
982 }; 724 };
983 - B5F3B73A0E43683600E001FD /* PBXTextBookmark */ = {  
984 - isa = PBXTextBookmark;  
985 - fRef = B5731AFB0E430B1F0008024F /* ASIHTTPRequestTests.m */;  
986 - name = "ASIHTTPRequestTests.m: 86";  
987 - rLen = 0;  
988 - rLoc = 3291;  
989 - rType = 0;  
990 - vrLen = 1408;  
991 - vrLoc = 0;  
992 - };  
993 - B5F3B7460E43698300E001FD /* PBXTextBookmark */ = {  
994 - isa = PBXTextBookmark;  
995 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
996 - name = "ASIHTTPRequest.h: 6";  
997 - rLen = 99;  
998 - rLoc = 137;  
999 - rType = 0;  
1000 - vrLen = 1657;  
1001 - vrLoc = 0;  
1002 - };  
1003 - B5F3B7470E43698300E001FD /* PBXTextBookmark */ = {  
1004 - isa = PBXTextBookmark;  
1005 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
1006 - name = "ASIHTTPRequest.m: 9";  
1007 - rLen = 0;  
1008 - rLoc = 236;  
1009 - rType = 0;  
1010 - vrLen = 1379;  
1011 - vrLoc = 0;  
1012 - };  
1013 - B5F3B7480E43698300E001FD /* PBXTextBookmark */ = {  
1014 - isa = PBXTextBookmark;  
1015 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
1016 - name = "ASIHTTPRequest.h: 6";  
1017 - rLen = 99;  
1018 - rLoc = 137;  
1019 - rType = 0;  
1020 - vrLen = 1657;  
1021 - vrLoc = 0;  
1022 - };  
1023 - B5F3B74A0E4378FA00E001FD /* PBXTextBookmark */ = {  
1024 - isa = PBXTextBookmark;  
1025 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
1026 - name = "ASIHTTPRequest.m: 17";  
1027 - rLen = 0;  
1028 - rLoc = 507;  
1029 - rType = 0;  
1030 - vrLen = 1379;  
1031 - vrLoc = 0;  
1032 - };  
1033 - B5F3B74B0E4378FA00E001FD /* PBXTextBookmark */ = {  
1034 - isa = PBXTextBookmark;  
1035 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
1036 - name = "ASIHTTPRequest.h: 6";  
1037 - rLen = 99;  
1038 - rLoc = 137;  
1039 - rType = 0;  
1040 - vrLen = 1495;  
1041 - vrLoc = 1728;  
1042 - };  
1043 B5F3B74C0E4378FA00E001FD /* PBXTextBookmark */ = { 725 B5F3B74C0E4378FA00E001FD /* PBXTextBookmark */ = {
1044 isa = PBXTextBookmark; 726 isa = PBXTextBookmark;
1045 fRef = B5ABC80D0E24CB100072F422 /* AppDelegate.h */; 727 fRef = B5ABC80D0E24CB100072F422 /* AppDelegate.h */;
@@ -1050,64 +732,4 @@ @@ -1050,64 +732,4 @@
1050 vrLen = 1083; 732 vrLen = 1083;
1051 vrLoc = 0; 733 vrLoc = 0;
1052 }; 734 };
1053 - B5F3B74D0E4378FA00E001FD /* PBXTextBookmark */ = {  
1054 - isa = PBXTextBookmark;  
1055 - fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;  
1056 - name = "AppDelegate.m: 146";  
1057 - rLen = 0;  
1058 - rLoc = 4820;  
1059 - rType = 0;  
1060 - vrLen = 1567;  
1061 - vrLoc = 4532;  
1062 - };  
1063 - B5F3B74E0E4378FA00E001FD /* PBXTextBookmark */ = {  
1064 - isa = PBXTextBookmark;  
1065 - fRef = B5ABC7B90E24C5620072F422 /* ASIHTTPRequest.m */;  
1066 - name = "ASIHTTPRequest.m: 17";  
1067 - rLen = 0;  
1068 - rLoc = 507;  
1069 - rType = 0;  
1070 - vrLen = 1379;  
1071 - vrLoc = 0;  
1072 - };  
1073 - B5F3B74F0E4378FA00E001FD /* PBXTextBookmark */ = {  
1074 - isa = PBXTextBookmark;  
1075 - fRef = B5ABC7BA0E24C5620072F422 /* ASIHTTPRequest.h */;  
1076 - name = "ASIHTTPRequest.h: 6";  
1077 - rLen = 99;  
1078 - rLoc = 137;  
1079 - rType = 0;  
1080 - vrLen = 1495;  
1081 - vrLoc = 1728;  
1082 - };  
1083 - B5F3B7500E4378FA00E001FD /* PBXTextBookmark */ = {  
1084 - isa = PBXTextBookmark;  
1085 - fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;  
1086 - name = "AppDelegate.m: 146";  
1087 - rLen = 0;  
1088 - rLoc = 4820;  
1089 - rType = 0;  
1090 - vrLen = 1567;  
1091 - vrLoc = 4532;  
1092 - };  
1093 - B5F3B7510E4378FA00E001FD /* PBXTextBookmark */ = {  
1094 - isa = PBXTextBookmark;  
1095 - fRef = B5ABC80D0E24CB100072F422 /* AppDelegate.h */;  
1096 - name = "AppDelegate.h: 4";  
1097 - rLen = 0;  
1098 - rLoc = 42;  
1099 - rType = 0;  
1100 - vrLen = 1083;  
1101 - vrLoc = 0;  
1102 - };  
1103 - B5F3B7520E4378FA00E001FD /* PBXTextBookmark */ = {  
1104 - isa = PBXTextBookmark;  
1105 - fRef = B5ABC80E0E24CB100072F422 /* AppDelegate.m */;  
1106 - name = "AppDelegate.m: 157";  
1107 - rLen = 0;  
1108 - rLoc = 5256;  
1109 - rType = 0;  
1110 - vrLen = 1567;  
1111 - vrLoc = 4532;  
1112 - };  
1113 } 735 }