Fixing a bug where exception feeds that are being repaired have the wrong feed_id because they've already been de-duped.

This commit is contained in:
Samuel Clay 2010-11-12 10:55:44 -05:00
parent af836c03ec
commit 21cfaec72a
8 changed files with 233 additions and 758 deletions

View file

@ -8,6 +8,7 @@ from django.db import IntegrityError
from django.views.decorators.cache import never_cache
from django.core.urlresolvers import reverse
from django.contrib.auth import login as login_user
from django.contrib.auth import logout as logout_user
from django.contrib.auth.models import User
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
from django.conf import settings
@ -76,21 +77,20 @@ def index(request):
@never_cache
def login(request):
code = -1
if request.method == "POST":
print request.POST
form = LoginForm(request.POST, prefix='login')
print form
if form.is_valid():
login_user(request, form.get_user())
if request.POST.get('api'):
logging.info(" ---> [%s] iPhone Login" % form.get_user())
return HttpResponse(json.encode(dict(code=1)), mimetype='application/json')
code = 1
else:
logging.info(" ---> [%s] Login" % form.get_user())
return HttpResponseRedirect(reverse('index'))
if request.POST.get('api'):
return HttpResponse(json.encode(dict(code=-1)), mimetype='application/json')
return HttpResponse(json.encode(dict(code=code)), mimetype='application/json')
else:
return index(request)
@ -109,8 +109,7 @@ def signup(request):
@never_cache
def logout(request):
logging.info(" ---> [%s] Logout" % request.user)
from django.contrib.auth import logout
logout(request)
logout_user(request)
if request.GET.get('api'):
return HttpResponse(json.encode(dict(code=1)), mimetype='application/json')
@ -654,14 +653,18 @@ def save_feed_chooser(request):
approved_feeds = [int(feed_id) for feed_id in request.POST.getlist('approved_feeds')][:64]
activated = 0
usersubs = UserSubscription.objects.filter(user=request.user)
for sub in usersubs:
if sub.feed.pk in approved_feeds:
sub.active = True
activated += 1
sub.save()
elif sub.active:
sub.active = False
sub.save()
try:
if sub.feed.pk in approved_feeds:
sub.active = True
activated += 1
sub.save()
elif sub.active:
sub.active = False
sub.save()
except Feed.DoesNotExist:
pass
queue_new_feeds(request.user)

View file

@ -83,10 +83,9 @@ def exception_change_feed_address(request):
feed.feed_address = feed_address
feed.next_scheduled_update = datetime.datetime.utcnow()
retry_feed = feed
try:
feed.save()
except IntegrityError:
original_feed = Feed.objects.get(feed_address=feed_address)
duplicate_feed_id = feed.save()
if duplicate_feed_id:
original_feed = Feed.objects.get(pk=duplicate_feed_id)
retry_feed = original_feed
original_feed.next_scheduled_update = datetime.datetime.utcnow()
original_feed.has_feed_exception = False
@ -122,16 +121,14 @@ def exception_change_feed_link(request):
feed.feed_link = feed_link
feed.feed_address = feed_address
feed.next_scheduled_update = datetime.datetime.utcnow()
try:
feed.save()
except IntegrityError:
original_feed = Feed.objects.get(feed_address=feed_address)
duplicate_feed_id = feed.save()
if duplicate_feed_id:
original_feed = Feed.objects.get(pk=duplicate_feed_id)
retry_feed = original_feed
original_feed.next_scheduled_update = datetime.datetime.utcnow()
original_feed.has_page_exception = False
original_feed.active = True
original_feed.save()
merge_feeds(original_feed.pk, feed.pk)
logging.info(" ---> [%s] Fixing feed exception by link: %s" % (request.user, retry_feed.feed_link))
retry_feed.update()

View file

@ -64,7 +64,6 @@
- (void)showLogin {
UINavigationController *navController = self.navigationController;
[navController presentModalViewController:loginViewController animated:YES];
[navController release];
}
- (void)reloadFeedsView {

View file

@ -56,7 +56,7 @@
}
- (void)viewWillDisappear:(BOOL)animated {
[appDelegate showNavigationBar:YES];
//[appDelegate showNavigationBar:YES];
[super viewWillDisappear:animated];
}
@ -103,6 +103,7 @@
- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
{
NSLog(@"didReceiveData");
NSString *jsonString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
NSDictionary *results = [[NSDictionary alloc] initWithDictionary:[jsonString JSONValue]];
@ -133,7 +134,7 @@
}
- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
NSLog(@"didReceiveResponse");
NSLog(@"didReceiveResponse: %@", response);
NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse*)response;
int responseStatusCode = [httpResponse statusCode];
if (responseStatusCode == 403) {
@ -164,21 +165,21 @@
[theRequest release];
}
- (void)requestDidStartLoad:(TTURLRequest*)request {
NSLog(@"Starting");
}
- (void)requestDidFinishLoad:(TTURLRequest *)request {
[appDelegate reloadFeedsView];
}
- (void)request:(TTURLRequest *)request didFailLoadWithError:(NSError *)error {
NSLog(@"Error: %@", error);
NSLog(@"%@", error );
}
}//
//
//- (void)requestDidStartLoad:(TTURLRequest*)request {
// NSLog(@"Starting");
//}
//
//- (void)requestDidFinishLoad:(TTURLRequest *)request {
// [appDelegate reloadFeedsView];
//}
//
//- (void)request:(TTURLRequest *)request didFailLoadWithError:(NSError *)error {
// NSLog(@"Error: %@", error);
// NSLog(@"%@", error );
//
//}
#pragma mark -
#pragma mark Table View - Feed List

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">10H574</string>
<string key="IBDocument.SystemVersion">10F569</string>
<string key="IBDocument.InterfaceBuilderVersion">804</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -13,6 +13,7 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="10"/>
<integer value="102"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -72,6 +73,9 @@
</object>
<object class="IBUIViewController" id="766163246">
<string key="IBUINibName">LoginViewController</string>
<object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
<bool key="IBUIPrompted">NO</bool>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="interfaceOrientation">1</int>
@ -343,7 +347,7 @@
<string>{{759, 376}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>LoginViewController</string>
<string>{{1104, 466}, {320, 480}}</string>
<string>{{635, 208}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{1238, 390}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

View file

@ -200,7 +200,10 @@
<key>XCObserverAutoDisconnectKey</key>
<true/>
<key>XCObserverDefintionKey</key>
<dict/>
<dict>
<key>PBXStatusErrorsKey</key>
<integer>0</integer>
</dict>
<key>XCObserverFactoryKey</key>
<string>XCPerspectivesSpecificationIdentifier</string>
<key>XCObserverGUIDKey</key>
@ -212,7 +215,58 @@
<key>XCObserverTriggerKey</key>
<string>awakenModuleWithObserver:</string>
<key>XCObserverValidationKey</key>
<dict/>
<dict>
<key>PBXStatusErrorsKey</key>
<integer>2</integer>
</dict>
</dict>
<dict>
<key>XCObserverAutoDisconnectKey</key>
<true/>
<key>XCObserverDefintionKey</key>
<dict>
<key>PBXStatusWarningsKey</key>
<integer>0</integer>
</dict>
<key>XCObserverFactoryKey</key>
<string>XCPerspectivesSpecificationIdentifier</string>
<key>XCObserverGUIDKey</key>
<string>XCObserverProjectIdentifier</string>
<key>XCObserverNotificationKey</key>
<string>PBXStatusBuildStateMessageNotification</string>
<key>XCObserverTargetKey</key>
<string>XCMainBuildResultsModuleGUID</string>
<key>XCObserverTriggerKey</key>
<string>awakenModuleWithObserver:</string>
<key>XCObserverValidationKey</key>
<dict>
<key>PBXStatusWarningsKey</key>
<integer>2</integer>
</dict>
</dict>
<dict>
<key>XCObserverAutoDisconnectKey</key>
<true/>
<key>XCObserverDefintionKey</key>
<dict>
<key>PBXStatusAnalyzerResultsKey</key>
<integer>0</integer>
</dict>
<key>XCObserverFactoryKey</key>
<string>XCPerspectivesSpecificationIdentifier</string>
<key>XCObserverGUIDKey</key>
<string>XCObserverProjectIdentifier</string>
<key>XCObserverNotificationKey</key>
<string>PBXStatusBuildStateMessageNotification</string>
<key>XCObserverTargetKey</key>
<string>XCMainBuildResultsModuleGUID</string>
<key>XCObserverTriggerKey</key>
<string>awakenModuleWithObserver:</string>
<key>XCObserverValidationKey</key>
<dict>
<key>PBXStatusAnalyzerResultsKey</key>
<integer>2</integer>
</dict>
</dict>
</array>
<key>OpenEditors</key>
@ -285,6 +339,7 @@
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>080E96DDFE201D6D7F000001</string>
<string>29B97317FDCFA39411CA2CEA</string>
<string>29B97323FDCFA39411CA2CEA</string>
<string>1C37FBAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
@ -298,7 +353,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {277, 1033}}</string>
<string>{{0, 3}, {277, 764}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@ -310,14 +365,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {294, 1051}}</string>
<string>{{0, 0}, {294, 782}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>277</real>
</array>
<key>RubberWindowFrame</key>
<string>513 86 1075 1092 0 0 1920 1178 </string>
<string>222 55 1075 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@ -347,7 +402,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>784DDD27128CFE6600AE08E0</string>
<string>7818E472128D90F200EE5FC5</string>
<key>history</key>
<array>
<string>7842EB9911CFFC1B0066CF9D</string>
@ -356,33 +411,12 @@
<string>7843F5AC11EEC0AA00675F64</string>
<string>7843F5AD11EEC0AA00675F64</string>
<string>7843F5AE11EEC0AA00675F64</string>
<string>7816BE07128C4651008ED38C</string>
<string>782D83C5128CD39B009B6727</string>
<string>784DDBD8128CE3B100AE08E0</string>
<string>784DDBD9128CE3B100AE08E0</string>
<string>784DDBDA128CE3B100AE08E0</string>
<string>784DDBDC128CE3B100AE08E0</string>
<string>784DDBF0128CE7B400AE08E0</string>
<string>784DDBF2128CE7B400AE08E0</string>
<string>784DDBF4128CE7B400AE08E0</string>
<string>784DDBF6128CE7B400AE08E0</string>
<string>784DDBF8128CE7B400AE08E0</string>
<string>784DDBFA128CE7B400AE08E0</string>
<string>784DDBFC128CE7B400AE08E0</string>
<string>784DDBFE128CE7B400AE08E0</string>
<string>784DDC00128CE7B400AE08E0</string>
<string>784DDC02128CE7B400AE08E0</string>
<string>784DDC04128CE7B400AE08E0</string>
<string>784DDC06128CE7B400AE08E0</string>
<string>784DDC08128CE7B400AE08E0</string>
<string>784DDC0A128CE7B400AE08E0</string>
<string>784DDC0C128CE7B400AE08E0</string>
<string>784DDC0E128CE7B400AE08E0</string>
<string>784DDC10128CE7B400AE08E0</string>
<string>784DDC12128CE7B400AE08E0</string>
<string>784DDC14128CE7B400AE08E0</string>
<string>784DDC16128CE7B400AE08E0</string>
<string>784DDC18128CE7B400AE08E0</string>
<string>784DDC1A128CE7B400AE08E0</string>
<string>784DDC1B128CE7B400AE08E0</string>
<string>784DDC1C128CE7B400AE08E0</string>
@ -392,9 +426,9 @@
<string>784DDC4B128CEE1C00AE08E0</string>
<string>784DDC4C128CEE1C00AE08E0</string>
<string>784DDCF2128CFA6F00AE08E0</string>
<string>784DDD08128CFBEE00AE08E0</string>
<string>784DDD09128CFBEE00AE08E0</string>
<string>784DDD0A128CFBEE00AE08E0</string>
<string>7818E455128D8F6400EE5FC5</string>
<string>7818E456128D8F6400EE5FC5</string>
<string>7818E457128D8F6400EE5FC5</string>
</array>
</dict>
<key>SplitCount</key>
@ -406,14 +440,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {776, 860}}</string>
<string>{{0, 0}, {776, 635}}</string>
<key>RubberWindowFrame</key>
<string>513 86 1075 1092 0 0 1920 1178 </string>
<string>222 55 1075 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>860pt</string>
<string>635pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@ -426,14 +460,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 865}, {776, 186}}</string>
<string>{{0, 640}, {776, 142}}</string>
<key>RubberWindowFrame</key>
<string>513 86 1075 1092 0 0 1920 1178 </string>
<string>222 55 1075 823 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
<string>186pt</string>
<string>142pt</string>
</dict>
</array>
<key>Proportion</key>
@ -452,9 +486,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>784DDCB3128CF11300AE08E0</string>
<string>7818E459128D8F6400EE5FC5</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>784DDCB4128CF11300AE08E0</string>
<string>7818E45A128D8F6400EE5FC5</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@ -589,7 +623,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
<real>311230054.29636103</real>
<real>311267570.34560901</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
@ -606,15 +640,16 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>784DDD1A128CFD2A00AE08E0</string>
<string>784DDD1B128CFD2A00AE08E0</string>
<string>7818E45D128D8F8500EE5FC5</string>
<string>7818E46D128D907C00EE5FC5</string>
<string>7818E45C128D8F6400EE5FC5</string>
<string>1C78EAAD065D492600B07095</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>788997AE11C9C87C00041675</string>
<string>/Users/conesus/Projects/newsblur/media/iphone/NewsBlur.xcodeproj</string>
<string>1C78EAAD065D492600B07095</string>
<string>/Users/conesus/newsblur/media/iphone/NewsBlur.xcodeproj</string>
</array>
<key>WindowString</key>
<string>513 86 1075 1092 0 0 1920 1178 </string>
<string>222 55 1075 823 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@ -644,7 +679,7 @@
<key>Frame</key>
<string>{{0, 0}, {897, 251}}</string>
<key>RubberWindowFrame</key>
<string>544 502 897 533 0 0 1920 1178 </string>
<string>289 275 897 533 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@ -663,14 +698,14 @@
<key>XCBuildResultsTrigger_Collapse</key>
<integer>1020</integer>
<key>XCBuildResultsTrigger_Open</key>
<integer>1010</integer>
<integer>1013</integer>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 256}, {897, 236}}</string>
<key>RubberWindowFrame</key>
<string>544 502 897 533 0 0 1920 1178 </string>
<string>289 275 897 533 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@ -693,7 +728,7 @@
<key>TableOfContents</key>
<array>
<string>788997AE11C9C87C00041675</string>
<string>784DDCB1128CF10D00AE08E0</string>
<string>7818E43E128D8D0A00EE5FC5</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@ -702,7 +737,7 @@
<key>WindowContentMinSize</key>
<string>486 300</string>
<key>WindowString</key>
<string>544 502 897 533 0 0 1920 1178 </string>
<string>289 275 897 533 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>788997AE11C9C87C00041675</string>
<key>WindowToolIsVisible</key>
@ -737,8 +772,8 @@
<string>yes</string>
<key>sizes</key>
<array>
<string>{{0, 0}, {648, 339}}</string>
<string>{{0, 339}, {648, 340}}</string>
<string>{{0, 0}, {648, 355}}</string>
<string>{{648, 0}, {647, 355}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@ -753,8 +788,8 @@
<string>yes</string>
<key>sizes</key>
<array>
<string>{{0, 0}, {648, 679}}</string>
<string>{{648, 0}, {647, 679}}</string>
<string>{{0, 0}, {1295, 355}}</string>
<string>{{0, 355}, {1295, 324}}</string>
</array>
</dict>
</dict>
@ -786,15 +821,15 @@
<string>Value</string>
<real>85</real>
<string>Summary</string>
<real>331</real>
<real>330</real>
</array>
<key>Frame</key>
<string>{{0, 339}, {648, 340}}</string>
<string>{{648, 0}, {647, 355}}</string>
<key>RubberWindowFrame</key>
<string>591 328 1295 720 0 0 1920 1178 </string>
<string>137 125 1295 720 0 0 1440 878 </string>
</dict>
<key>RubberWindowFrame</key>
<string>591 328 1295 720 0 0 1920 1178 </string>
<string>137 125 1295 720 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@ -817,18 +852,18 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>784DDCDE128CF94900AE08E0</string>
<string>7818E444128D8D7700EE5FC5</string>
<string>1C162984064C10D400B95A72</string>
<string>784DDCDF128CF94900AE08E0</string>
<string>784DDCE0128CF94900AE08E0</string>
<string>784DDCE1128CF94900AE08E0</string>
<string>784DDCE2128CF94900AE08E0</string>
<string>784DDCE3128CF94900AE08E0</string>
<string>7818E445128D8D7700EE5FC5</string>
<string>7818E446128D8D7700EE5FC5</string>
<string>7818E447128D8D7700EE5FC5</string>
<string>7818E448128D8D7700EE5FC5</string>
<string>7818E449128D8D7700EE5FC5</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
<string>591 328 1295 720 0 0 1920 1178 </string>
<string>137 125 1295 720 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
@ -956,7 +991,7 @@
<key>Frame</key>
<string>{{0, 0}, {744, 532}}</string>
<key>RubberWindowFrame</key>
<string>569 230 744 573 0 0 1920 1178 </string>
<string>337 135 744 573 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@ -979,17 +1014,17 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>784DDCE4128CF94900AE08E0</string>
<string>7818E44A128D8D7700EE5FC5</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
<string>569 230 744 573 0 0 1920 1178 </string>
<string>337 135 744 573 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
<true/>
<false/>
</dict>
<dict>
<key>Identifier</key>

View file

@ -10,9 +10,9 @@
};
1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {727, 1352}}";
sepNavSelRange = "{1644, 9}";
sepNavVisRange = "{280, 1768}";
sepNavIntBoundsRect = "{{0, 0}, {727, 1339}}";
sepNavSelRange = "{1807, 0}";
sepNavVisRange = "{1473, 1474}";
sepNavWindowFrame = "{{97, 294}, {750, 558}}";
};
};
@ -32,9 +32,9 @@
};
28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {727, 3523}}";
sepNavSelRange = "{2863, 0}";
sepNavVisRange = "{2353, 2159}";
sepNavIntBoundsRect = "{{0, 0}, {727, 3419}}";
sepNavSelRange = "{4195, 0}";
sepNavVisRange = "{3723, 1426}";
sepNavWindowFrame = "{{78, 315}, {750, 558}}";
};
};
@ -118,7 +118,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
456,
497,
60,
20,
48,
@ -135,84 +135,35 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 311226629;
PBXWorkspaceStateSaveDate = 311226629;
PBXPerProjectTemplateStateSaveDate = 311230801;
PBXWorkspaceStateSaveDate = 311230801;
};
perUserProjectItems = {
7816BE07128C4651008ED38C = 7816BE07128C4651008ED38C /* PBXTextBookmark */;
782D83C5128CD39B009B6727 = 782D83C5128CD39B009B6727 /* PBXTextBookmark */;
7842EB9911CFFC1B0066CF9D = 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */;
7843F5AA11EEC0AA00675F64 = 7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AB11EEC0AA00675F64 = 7843F5AB11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AC11EEC0AA00675F64 = 7843F5AC11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AD11EEC0AA00675F64 = 7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AE11EEC0AA00675F64 = 7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */;
784DDBD8128CE3B100AE08E0 = 784DDBD8128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBD9128CE3B100AE08E0 = 784DDBD9128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBDA128CE3B100AE08E0 = 784DDBDA128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBDC128CE3B100AE08E0 = 784DDBDC128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBDE128CE3B100AE08E0 = 784DDBDE128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBF0128CE7B400AE08E0 = 784DDBF0128CE7B400AE08E0 /* PBXTextBookmark */;
784DDBF2128CE7B400AE08E0 = 784DDBF2128CE7B400AE08E0 /* PBXBookmark */;
784DDBF4128CE7B400AE08E0 = 784DDBF4128CE7B400AE08E0 /* PBXBookmark */;
784DDBF6128CE7B400AE08E0 = 784DDBF6128CE7B400AE08E0 /* PBXBookmark */;
784DDBF8128CE7B400AE08E0 = 784DDBF8128CE7B400AE08E0 /* PBXBookmark */;
784DDBFA128CE7B400AE08E0 = 784DDBFA128CE7B400AE08E0 /* PBXBookmark */;
784DDBFC128CE7B400AE08E0 = 784DDBFC128CE7B400AE08E0 /* PBXBookmark */;
784DDBFE128CE7B400AE08E0 = 784DDBFE128CE7B400AE08E0 /* PBXBookmark */;
784DDC00128CE7B400AE08E0 = 784DDC00128CE7B400AE08E0 /* PBXBookmark */;
784DDC02128CE7B400AE08E0 = 784DDC02128CE7B400AE08E0 /* PBXTextBookmark */;
784DDC04128CE7B400AE08E0 = 784DDC04128CE7B400AE08E0 /* PBXBookmark */;
784DDC06128CE7B400AE08E0 = 784DDC06128CE7B400AE08E0 /* PBXBookmark */;
784DDC08128CE7B400AE08E0 = 784DDC08128CE7B400AE08E0 /* PBXBookmark */;
784DDC0A128CE7B400AE08E0 = 784DDC0A128CE7B400AE08E0 /* PBXBookmark */;
784DDC0C128CE7B400AE08E0 = 784DDC0C128CE7B400AE08E0 /* PBXBookmark */;
784DDC0E128CE7B400AE08E0 = 784DDC0E128CE7B400AE08E0 /* PBXBookmark */;
784DDC10128CE7B400AE08E0 = 784DDC10128CE7B400AE08E0 /* PBXBookmark */;
784DDC12128CE7B400AE08E0 = 784DDC12128CE7B400AE08E0 /* PBXBookmark */;
784DDC14128CE7B400AE08E0 = 784DDC14128CE7B400AE08E0 /* PBXBookmark */;
784DDC16128CE7B400AE08E0 = 784DDC16128CE7B400AE08E0 /* PBXBookmark */;
784DDC18128CE7B400AE08E0 = 784DDC18128CE7B400AE08E0 /* PBXBookmark */;
784DDC1A128CE7B400AE08E0 = 784DDC1A128CE7B400AE08E0 /* PBXBookmark */;
784DDC1B128CE7B400AE08E0 = 784DDC1B128CE7B400AE08E0 /* PBXBookmark */;
784DDC1C128CE7B400AE08E0 = 784DDC1C128CE7B400AE08E0 /* PBXBookmark */;
784DDC1D128CE7B400AE08E0 = 784DDC1D128CE7B400AE08E0 /* PBXBookmark */;
784DDC22128CE97100AE08E0 = 784DDC22128CE97100AE08E0 /* PlistBookmark */;
784DDC2E128CEA7300AE08E0 = 784DDC2E128CEA7300AE08E0 /* PBXTextBookmark */;
784DDC4B128CEE1C00AE08E0 = 784DDC4B128CEE1C00AE08E0 /* PBXTextBookmark */;
784DDC4C128CEE1C00AE08E0 = 784DDC4C128CEE1C00AE08E0 /* PBXTextBookmark */;
784DDC61128CEFDD00AE08E0 = 784DDC61128CEFDD00AE08E0 /* PBXTextBookmark */;
784DDC78128CF10100AE08E0 = 784DDC78128CF10100AE08E0 /* PBXTextBookmark */;
784DDC79128CF10100AE08E0 = 784DDC79128CF10100AE08E0 /* PBXTextBookmark */;
784DDC7A128CF10100AE08E0 = 784DDC7A128CF10100AE08E0 /* PBXTextBookmark */;
784DDCB2128CF11300AE08E0 /* PBXTextBookmark */ = 784DDCB2128CF11300AE08E0 /* PBXTextBookmark */;
784DDCE5128CF94900AE08E0 /* PBXTextBookmark */ = 784DDCE5128CF94900AE08E0 /* PBXTextBookmark */;
784DDCE6128CF94900AE08E0 /* PBXTextBookmark */ = 784DDCE6128CF94900AE08E0 /* PBXTextBookmark */;
784DDCE7128CF94900AE08E0 /* PBXTextBookmark */ = 784DDCE7128CF94900AE08E0 /* PBXTextBookmark */;
784DDCEC128CF9B300AE08E0 /* PBXTextBookmark */ = 784DDCEC128CF9B300AE08E0 /* PBXTextBookmark */;
784DDCED128CF9B300AE08E0 /* PBXTextBookmark */ = 784DDCED128CF9B300AE08E0 /* PBXTextBookmark */;
784DDCEE128CF9B300AE08E0 /* PBXTextBookmark */ = 784DDCEE128CF9B300AE08E0 /* PBXTextBookmark */;
7818E455128D8F6400EE5FC5 /* PBXTextBookmark */ = 7818E455128D8F6400EE5FC5 /* PBXTextBookmark */;
7818E456128D8F6400EE5FC5 /* PBXTextBookmark */ = 7818E456128D8F6400EE5FC5 /* PBXTextBookmark */;
7818E457128D8F6400EE5FC5 /* PBXTextBookmark */ = 7818E457128D8F6400EE5FC5 /* PBXTextBookmark */;
7818E472128D90F200EE5FC5 /* PBXTextBookmark */ = 7818E472128D90F200EE5FC5 /* PBXTextBookmark */;
782D83C5128CD39B009B6727 /* PBXTextBookmark */ = 782D83C5128CD39B009B6727 /* PBXTextBookmark */;
7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */ = 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */;
7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AB11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AB11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AC11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AC11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */;
784DDBD8128CE3B100AE08E0 /* PBXTextBookmark */ = 784DDBD8128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBD9128CE3B100AE08E0 /* PBXTextBookmark */ = 784DDBD9128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBDA128CE3B100AE08E0 /* PBXTextBookmark */ = 784DDBDA128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBDC128CE3B100AE08E0 /* PBXTextBookmark */ = 784DDBDC128CE3B100AE08E0 /* PBXTextBookmark */;
784DDBF0128CE7B400AE08E0 /* PBXTextBookmark */ = 784DDBF0128CE7B400AE08E0 /* PBXTextBookmark */;
784DDC1A128CE7B400AE08E0 /* PBXBookmark */ = 784DDC1A128CE7B400AE08E0 /* PBXBookmark */;
784DDC1B128CE7B400AE08E0 /* PBXBookmark */ = 784DDC1B128CE7B400AE08E0 /* PBXBookmark */;
784DDC1C128CE7B400AE08E0 /* PBXBookmark */ = 784DDC1C128CE7B400AE08E0 /* PBXBookmark */;
784DDC1D128CE7B400AE08E0 /* PBXBookmark */ = 784DDC1D128CE7B400AE08E0 /* PBXBookmark */;
784DDC22128CE97100AE08E0 /* PlistBookmark */ = 784DDC22128CE97100AE08E0 /* PlistBookmark */;
784DDC2E128CEA7300AE08E0 /* PBXTextBookmark */ = 784DDC2E128CEA7300AE08E0 /* PBXTextBookmark */;
784DDC4B128CEE1C00AE08E0 /* PBXTextBookmark */ = 784DDC4B128CEE1C00AE08E0 /* PBXTextBookmark */;
784DDC4C128CEE1C00AE08E0 /* PBXTextBookmark */ = 784DDC4C128CEE1C00AE08E0 /* PBXTextBookmark */;
784DDCF2128CFA6F00AE08E0 /* PBXTextBookmark */ = 784DDCF2128CFA6F00AE08E0 /* PBXTextBookmark */;
784DDCF3128CFA6F00AE08E0 /* PBXTextBookmark */ = 784DDCF3128CFA6F00AE08E0 /* PBXTextBookmark */;
784DDCF8128CFB2B00AE08E0 /* PBXTextBookmark */ = 784DDCF8128CFB2B00AE08E0 /* PBXTextBookmark */;
784DDCF9128CFB2B00AE08E0 /* PBXTextBookmark */ = 784DDCF9128CFB2B00AE08E0 /* PBXTextBookmark */;
784DDCFA128CFB2B00AE08E0 /* PBXTextBookmark */ = 784DDCFA128CFB2B00AE08E0 /* PBXTextBookmark */;
784DDCFD128CFB5800AE08E0 /* PBXTextBookmark */ = 784DDCFD128CFB5800AE08E0 /* PBXTextBookmark */;
784DDCFE128CFB5800AE08E0 /* PBXTextBookmark */ = 784DDCFE128CFB5800AE08E0 /* PBXTextBookmark */;
784DDCFF128CFB5800AE08E0 /* PBXTextBookmark */ = 784DDCFF128CFB5800AE08E0 /* PBXTextBookmark */;
784DDD02128CFB7600AE08E0 /* PBXTextBookmark */ = 784DDD02128CFB7600AE08E0 /* PBXTextBookmark */;
784DDD05128CFB9000AE08E0 /* PBXTextBookmark */ = 784DDD05128CFB9000AE08E0 /* PBXTextBookmark */;
784DDD08128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD08128CFBEE00AE08E0 /* PBXTextBookmark */;
784DDD09128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD09128CFBEE00AE08E0 /* PBXTextBookmark */;
784DDD0A128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD0A128CFBEE00AE08E0 /* PBXTextBookmark */;
784DDD0B128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD0B128CFBEE00AE08E0 /* PBXTextBookmark */;
784DDD0E128CFC8A00AE08E0 /* PBXTextBookmark */ = 784DDD0E128CFC8A00AE08E0 /* PBXTextBookmark */;
784DDD13128CFCA100AE08E0 /* PBXTextBookmark */ = 784DDD13128CFCA100AE08E0 /* PBXTextBookmark */;
784DDD16128CFCB300AE08E0 /* PBXTextBookmark */ = 784DDD16128CFCB300AE08E0 /* PBXTextBookmark */;
784DDD18128CFD2A00AE08E0 /* PBXTextBookmark */ = 784DDD18128CFD2A00AE08E0 /* PBXTextBookmark */;
784DDD1D128CFD3B00AE08E0 /* PBXTextBookmark */ = 784DDD1D128CFD3B00AE08E0 /* PBXTextBookmark */;
784DDD22128CFD6C00AE08E0 /* PBXTextBookmark */ = 784DDD22128CFD6C00AE08E0 /* PBXTextBookmark */;
784DDD27128CFE6600AE08E0 /* PBXTextBookmark */ = 784DDD27128CFE6600AE08E0 /* PBXTextBookmark */;
};
sourceControlManager = 788997A911C9C3F000041675 /* Source Control */;
userBuildSettings = {
@ -233,22 +184,45 @@
sepNavWindowFrame = "{{75, 615}, {750, 558}}";
};
};
7816BE07128C4651008ED38C /* PBXTextBookmark */ = {
7818E455128D8F6400EE5FC5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 7816BE08128C4651008ED38C /* TTURLRequestDelegate.h */;
name = "TTURLRequestDelegate.h: 30";
rLen = 52;
rLoc = 865;
fRef = 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */;
name = "NewsBlurAppDelegate.m: 66";
rLen = 0;
rLoc = 1807;
rType = 0;
vrLen = 1173;
vrLoc = 0;
vrLen = 1474;
vrLoc = 1473;
};
7816BE08128C4651008ED38C /* TTURLRequestDelegate.h */ = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = TTURLRequestDelegate.h;
path = /Users/conesus/code/three20/Build/Products/three20/Three20Network/TTURLRequestDelegate.h;
sourceTree = "<absolute>";
7818E456128D8F6400EE5FC5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */;
name = "LoginViewController.m: 89";
rLen = 0;
rLoc = 2807;
rType = 0;
vrLen = 1225;
vrLoc = 2051;
};
7818E457128D8F6400EE5FC5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 138";
rLen = 0;
rLoc = 4162;
rType = 0;
vrLen = 1677;
vrLoc = 2893;
};
7818E472128D90F200EE5FC5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 139";
rLen = 0;
rLoc = 4195;
rType = 0;
vrLen = 1426;
vrLoc = 3723;
};
782D83C5128CD39B009B6727 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@ -360,7 +334,7 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {727, 1469}}";
sepNavSelRange = "{2807, 0}";
sepNavVisRange = "{1190, 2086}";
sepNavVisRange = "{2051, 1225}";
sepNavWindowFrame = "{{72, 315}, {750, 558}}";
};
};
@ -404,16 +378,6 @@
vrLen = 698;
vrLoc = 0;
};
784DDBDE128CE3B100AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */;
name = "LoginViewController.m: 54";
rLen = 0;
rLoc = 1440;
rType = 0;
vrLen = 911;
vrLoc = 0;
};
784DDBF0128CE7B400AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 7843F50411EEB1A000675F64 /* FeedDetailTableCell.m */;
@ -424,232 +388,6 @@
vrLen = 871;
vrLoc = 0;
};
784DDBF2128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBF3128CE7B400AE08E0 /* backIcon.png */;
};
784DDBF3128CE7B400AE08E0 /* backIcon.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = backIcon.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/backIcon.png;
sourceTree = "<absolute>";
};
784DDBF4128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBF5128CE7B400AE08E0 /* backIcon@2x.png */;
};
784DDBF5128CE7B400AE08E0 /* backIcon@2x.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = "backIcon@2x.png";
path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/backIcon@2x.png";
sourceTree = "<absolute>";
};
784DDBF6128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBF7128CE7B400AE08E0 /* blueArrow@2x.png */;
};
784DDBF7128CE7B400AE08E0 /* blueArrow@2x.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = "blueArrow@2x.png";
path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/blueArrow@2x.png";
sourceTree = "<absolute>";
};
784DDBF8128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBF9128CE7B400AE08E0 /* closeButton.png */;
};
784DDBF9128CE7B400AE08E0 /* closeButton.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = closeButton.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/closeButton.png;
sourceTree = "<absolute>";
};
784DDBFA128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBFB128CE7B400AE08E0 /* empty.png */;
};
784DDBFB128CE7B400AE08E0 /* empty.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = empty.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/empty.png;
sourceTree = "<absolute>";
};
784DDBFC128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBFD128CE7B400AE08E0 /* error.png */;
};
784DDBFD128CE7B400AE08E0 /* error.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = error.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/error.png;
sourceTree = "<absolute>";
};
784DDBFE128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDBFF128CE7B400AE08E0 /* forwardIcon.png */;
};
784DDBFF128CE7B400AE08E0 /* forwardIcon.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = forwardIcon.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/forwardIcon.png;
sourceTree = "<absolute>";
};
784DDC00128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC01128CE7B400AE08E0 /* forwardIcon@2x.png */;
};
784DDC01128CE7B400AE08E0 /* forwardIcon@2x.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = "forwardIcon@2x.png";
path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/forwardIcon@2x.png";
sourceTree = "<absolute>";
};
784DDC02128CE7B400AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 784DDC03128CE7B400AE08E0 /* Localizable.strings */;
name = "Localizable.strings: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 475;
vrLoc = 0;
};
784DDC03128CE7B400AE08E0 /* Localizable.strings */ = {
isa = PBXFileReference;
lastKnownFileType = text.plist.strings;
name = Localizable.strings;
path = /Users/conesus/Projects/three20/src/Three20.bundle/ja.lproj/Localizable.strings;
sourceTree = "<absolute>";
};
784DDC04128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC05128CE7B400AE08E0 /* nextIcon.png */;
};
784DDC05128CE7B400AE08E0 /* nextIcon.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = nextIcon.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/nextIcon.png;
sourceTree = "<absolute>";
};
784DDC06128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC07128CE7B400AE08E0 /* nextIcon@2x.png */;
};
784DDC07128CE7B400AE08E0 /* nextIcon@2x.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = "nextIcon@2x.png";
path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/nextIcon@2x.png";
sourceTree = "<absolute>";
};
784DDC08128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC09128CE7B400AE08E0 /* overflowLeft.png */;
};
784DDC09128CE7B400AE08E0 /* overflowLeft.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = overflowLeft.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/overflowLeft.png;
sourceTree = "<absolute>";
};
784DDC0A128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC0B128CE7B400AE08E0 /* overflowRight.png */;
};
784DDC0B128CE7B400AE08E0 /* overflowRight.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = overflowRight.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/overflowRight.png;
sourceTree = "<absolute>";
};
784DDC0C128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC0D128CE7B400AE08E0 /* photoDefault.png */;
};
784DDC0D128CE7B400AE08E0 /* photoDefault.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = photoDefault.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/photoDefault.png;
sourceTree = "<absolute>";
};
784DDC0E128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC0F128CE7B400AE08E0 /* previousIcon.png */;
};
784DDC0F128CE7B400AE08E0 /* previousIcon.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = previousIcon.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/previousIcon.png;
sourceTree = "<absolute>";
};
784DDC10128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC11128CE7B400AE08E0 /* previousIcon@2x.png */;
};
784DDC11128CE7B400AE08E0 /* previousIcon@2x.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = "previousIcon@2x.png";
path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/previousIcon@2x.png";
sourceTree = "<absolute>";
};
784DDC12128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC13128CE7B400AE08E0 /* searchIcon.png */;
};
784DDC13128CE7B400AE08E0 /* searchIcon.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = searchIcon.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/searchIcon.png;
sourceTree = "<absolute>";
};
784DDC14128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC15128CE7B400AE08E0 /* whiteArrow.png */;
};
784DDC15128CE7B400AE08E0 /* whiteArrow.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = whiteArrow.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/whiteArrow.png;
sourceTree = "<absolute>";
};
784DDC16128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC17128CE7B400AE08E0 /* blackArrow.png */;
};
784DDC17128CE7B400AE08E0 /* blackArrow.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = blackArrow.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/blackArrow.png;
sourceTree = "<absolute>";
};
784DDC18128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 784DDC19128CE7B400AE08E0 /* blueArrow.png */;
};
784DDC19128CE7B400AE08E0 /* blueArrow.png */ = {
isa = PBXFileReference;
lastKnownFileType = image.png;
name = blueArrow.png;
path = /Users/conesus/Projects/three20/src/Three20.bundle/images/blueArrow.png;
sourceTree = "<absolute>";
};
784DDC1A128CE7B400AE08E0 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 7843F50B11EEB4EE00675F64 /* bullet_blue.png */;
@ -707,116 +445,6 @@
vrLen = 941;
vrLoc = 0;
};
784DDC61128CEFDD00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */;
name = "NewsBlurAppDelegate.m: 64";
rLen = 9;
rLoc = 1644;
rType = 0;
vrLen = 1806;
vrLoc = 242;
};
784DDC78128CF10100AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 148";
rLen = 14;
rLoc = 4524;
rType = 0;
vrLen = 1878;
vrLoc = 3301;
};
784DDC79128CF10100AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
name = "NewsBlurViewController.h: 30";
rLen = 14;
rLoc = 669;
rType = 0;
vrLen = 1185;
vrLoc = 0;
};
784DDC7A128CF10100AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
name = "NewsBlurViewController.h: 27";
rLen = 0;
rLoc = 625;
rType = 0;
vrLen = 1219;
vrLoc = 0;
};
784DDCB2128CF11300AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
name = "NewsBlurViewController.h: 26";
rLen = 0;
rLoc = 625;
rType = 0;
vrLen = 1190;
vrLoc = 0;
};
784DDCE5128CF94900AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
name = "NewsBlurViewController.h: 31";
rLen = 0;
rLoc = 683;
rType = 0;
vrLen = 1237;
vrLoc = 0;
};
784DDCE6128CF94900AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 146";
rLen = 12;
rLoc = 4526;
rType = 0;
vrLen = 1804;
vrLoc = 3342;
};
784DDCE7128CF94900AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 146";
rLen = 0;
rLoc = 4538;
rType = 0;
vrLen = 1790;
vrLoc = 3342;
};
784DDCEC128CF9B300AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 146";
rLen = 0;
rLoc = 4538;
rType = 0;
vrLen = 1804;
vrLoc = 3342;
};
784DDCED128CF9B300AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
name = "NewsBlurViewController.h: 31";
rLen = 0;
rLoc = 683;
rType = 0;
vrLen = 1237;
vrLoc = 0;
};
784DDCEE128CF9B300AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
name = "NewsBlurViewController.h: 31";
rLen = 0;
rLoc = 683;
rType = 0;
vrLen = 1226;
vrLoc = 0;
};
784DDCF2128CFA6F00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */;
@ -827,206 +455,6 @@
vrLen = 1226;
vrLoc = 0;
};
784DDCF3128CFA6F00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 58";
rLen = 17;
rLoc = 1544;
rType = 0;
vrLen = 1586;
vrLoc = 0;
};
784DDCF8128CFB2B00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */;
name = "LoginViewController.m: 52";
rLen = 729;
rLoc = 1267;
rType = 0;
vrLen = 2398;
vrLoc = 1083;
};
784DDCF9128CFB2B00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 63";
rLen = 0;
rLoc = 1636;
rType = 0;
vrLen = 2158;
vrLoc = 1456;
};
784DDCFA128CFB2B00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 152";
rLen = 0;
rLoc = 4827;
rType = 0;
vrLen = 1802;
vrLoc = 3416;
};
784DDCFD128CFB5800AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */;
name = "LoginViewController.m: 10";
rLen = 28;
rLoc = 202;
rType = 0;
vrLen = 1998;
vrLoc = 0;
};
784DDCFE128CFB5800AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 12";
rLen = 0;
rLoc = 234;
rType = 0;
vrLen = 1596;
vrLoc = 0;
};
784DDCFF128CFB5800AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 12";
rLen = 0;
rLoc = 252;
rType = 0;
vrLen = 1611;
vrLoc = 0;
};
784DDD02128CFB7600AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 149";
rLen = 0;
rLoc = 4624;
rType = 0;
vrLen = 1817;
vrLoc = 3542;
};
784DDD05128CFB9000AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 158";
rLen = 0;
rLoc = 5008;
rType = 0;
vrLen = 1833;
vrLoc = 3542;
};
784DDD08128CFBEE00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */;
name = "NewsBlurAppDelegate.m: 64";
rLen = 9;
rLoc = 1644;
rType = 0;
vrLen = 1768;
vrLoc = 280;
};
784DDD09128CFBEE00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */;
name = "LoginViewController.m: 89";
rLen = 0;
rLoc = 2807;
rType = 0;
vrLen = 2086;
vrLoc = 1190;
};
784DDD0A128CFBEE00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 158";
rLen = 0;
rLoc = 5008;
rType = 0;
vrLen = 1885;
vrLoc = 3545;
};
784DDD0B128CFBEE00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 167";
rLen = 0;
rLoc = 5181;
rType = 0;
vrLen = 1685;
vrLoc = 3882;
};
784DDD0E128CFC8A00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 138";
rLen = 0;
rLoc = 4239;
rType = 0;
vrLen = 2372;
vrLoc = 2564;
};
784DDD13128CFCA100AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 134";
rLen = 0;
rLoc = 4239;
rType = 0;
vrLen = 2215;
vrLoc = 2564;
};
784DDD16128CFCB300AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 136";
rLen = 0;
rLoc = 4054;
rType = 0;
vrLen = 2398;
vrLoc = 2564;
};
784DDD18128CFD2A00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 139";
rLen = 0;
rLoc = 4172;
rType = 0;
vrLen = 2398;
vrLoc = 2564;
};
784DDD1D128CFD3B00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 139";
rLen = 0;
rLoc = 4172;
rType = 0;
vrLen = 2398;
vrLoc = 2564;
};
784DDD22128CFD6C00AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 141";
rLen = 0;
rLoc = 4236;
rType = 0;
vrLen = 2317;
vrLoc = 2564;
};
784DDD27128CFE6600AE08E0 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */;
name = "NewsBlurViewController.m: 106";
rLen = 0;
rLoc = 2863;
rType = 0;
vrLen = 2159;
vrLoc = 2353;
};
787A0CD811CE65330056422D /* FeedDetailViewController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {727, 847}}";
@ -1090,8 +518,17 @@
$es = 1;
$esi = 1;
$esp = 1;
$fctrl = 1;
$fioff = 1;
$fiseg = 1;
$fooff = 1;
$fop = 1;
$foseg = 1;
$fs = 1;
$fstat = 1;
$ftag = 1;
$gs = 1;
$mxcsr = 1;
$ss = 1;
};
};

View file

@ -22,7 +22,6 @@
782D8338128CCB6D009B6727 /* libThree20UI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D831C128CCB55009B6727 /* libThree20UI.a */; };
782D833B128CCB6E009B6727 /* libThree20UICommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D82F8128CCB55009B6727 /* libThree20UICommon.a */; };
782D833E128CCB71009B6727 /* libThree20UINavigator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D830A128CCB55009B6727 /* libThree20UINavigator.a */; };
782D8379128CCBAE009B6727 /* Three20.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 782D8378128CCBAE009B6727 /* Three20.bundle */; };
7842ECF811D44A530066CF9D /* StoryDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */; };
7842ECF911D44A540066CF9D /* StoryDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7842ECF711D44A530066CF9D /* StoryDetailViewController.xib */; };
7843F4E911EEABDC00675F64 /* FeedDetailTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7843F4E811EEABDC00675F64 /* FeedDetailTableCell.xib */; };
@ -410,7 +409,6 @@
782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UICommon.xcodeproj; path = ../../../three20/src/Three20UICommon/Three20UICommon.xcodeproj; sourceTree = SOURCE_ROOT; };
782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UINavigator.xcodeproj; path = ../../../three20/src/Three20UINavigator/Three20UINavigator.xcodeproj; sourceTree = SOURCE_ROOT; };
782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UI.xcodeproj; path = ../../../three20/src/Three20UI/Three20UI.xcodeproj; sourceTree = SOURCE_ROOT; };
782D8378128CCBAE009B6727 /* Three20.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Three20.bundle; path = ../../../three20/src/Three20.bundle; sourceTree = SOURCE_ROOT; };
7842ECF511D44A530066CF9D /* StoryDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StoryDetailViewController.h; sourceTree = "<group>"; };
7842ECF611D44A530066CF9D /* StoryDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoryDetailViewController.m; sourceTree = "<group>"; };
7842ECF711D44A530066CF9D /* StoryDetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StoryDetailViewController.xib; sourceTree = "<group>"; };
@ -523,7 +521,6 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
782D8378128CCBAE009B6727 /* Three20.bundle */,
7843F50B11EEB4EE00675F64 /* bullet_blue.png */,
7843F50C11EEB4EE00675F64 /* bullet_orange.png */,
7843F50D11EEB4EE00675F64 /* bullet_red.png */,
@ -1060,7 +1057,6 @@
7843F51111EEB4EE00675F64 /* bullet_red.png in Resources */,
7843F51211EEB4EE00675F64 /* bullet_yellow.png in Resources */,
784B50E5127E3A6A008F90EA /* LoginViewController.xib in Resources */,
782D8379128CCBAE009B6727 /* Three20.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1137,7 +1133,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = NewsBlur_Prefix.pch;
HEADER_SEARCH_PATHS = "~/Projects/three20/Build/Products/three20";
HEADER_SEARCH_PATHS = (
"~/three20/Build/Products/three20",
"~/Projects/three20/Build/Products/three20",
);
INFOPLIST_FILE = "NewsBlur-Info.plist";
OTHER_LDFLAGS = (
"-all_load",