Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #43 from barijaona/experimental

Fix some nasty bugs
  • Loading branch information...
commit a948ab6fc2a973b41d74496bcee7f28de6ac281d 2 parents 88c7a16 + bc0a6e0
@mstroeck mstroeck authored
View
4 Database.m
@@ -1968,7 +1968,7 @@ -(BOOL)initArticleArray:(Folder *)folder
// them if not.
if (unread_count != [folder unreadCount])
{
- NSLog(@"Fixing unread count for %@ (%@ on folder versus %@ in articles)", [folder name], [folder unreadCount], unread_count);
+ NSLog(@"Fixing unread count for %@ (%ld on folder versus %ld in articles)", [folder name], (long)[folder unreadCount], (long)unread_count);
NSInteger diff = (unread_count - [folder unreadCount]);
[self setFolderUnreadCount:folder adjustment:diff];
countOfUnread += diff;
@@ -2341,7 +2341,7 @@ -(NSArray *)arrayOfArticles:(NSInteger)folderId filterString:(NSString *)filterS
{
if (unread_count != [folder unreadCount])
{
- NSLog(@"Fixing unread count for %@ (%@ on folder versus %@ in articles)", [folder name], [folder unreadCount], unread_count);
+ NSLog(@"Fixing unread count for %@ (%ld on folder versus %ld in articles)", [folder name], (long)[folder unreadCount], (long)unread_count);
NSInteger diff = (unread_count - [folder unreadCount]);
[self setFolderUnreadCount:folder adjustment:diff];
countOfUnread += diff;
View
2  GoogleReader.m
@@ -533,6 +533,8 @@ -(void)subscriptionsRequestDone:(ASIHTTPRequest *)request
{
LOG_EXPR(feed);
NSString * feedID = [feed objectForKey:@"id"];
+ if (feedID == nil)
+ break;
NSString * feedURL = [feedID stringByReplacingOccurrencesOfString:@"feed/" withString:@"" options:0 range:NSMakeRange(0, 5)];
NSString * folderName = nil;
View
7 RefreshManager.m
@@ -609,7 +609,10 @@ -(void)folderRefreshCompleted:(ASIHTTPRequest *)connector
else if (responseStatusCode == 304)
{
// No modification from last check
+ [[RefreshManager articlesUpdateSemaphore] lock];
[db setFolderLastUpdate:folderId lastUpdate:[NSDate date]];
+ [[RefreshManager articlesUpdateSemaphore] unlock];
+
[self setFolderErrorFlag:folder flag:NO];
[connectorItem appendDetail:NSLocalizedString(@"Got HTTP status 304 - No news from last check", nil)];
[connectorItem setStatus:NSLocalizedString(@"No new articles available", nil)];
@@ -869,13 +872,13 @@ -(void)finalizeFolderRefresh:(NSDictionary*)parameters;
// If this folder also requires an image refresh, add that
if ([folder flags] & MA_FFlag_CheckForImage)
- [self performSelectorInBackground:@selector(refreshFavIcon:) withObject:folder];
+ [self performSelector:@selector(refreshFavIcon:) withObject:folder afterDelay:0];
// Add to count of new articles so far
countOfNewArticles += newArticlesFromFeed;
// Unread count may have changed
- [[NSApp delegate] showUnreadCountOnApplicationIconAndWindowTitle];
+ [[NSApp delegate] performSelectorOnMainThread:@selector(showUnreadCountOnApplicationIconAndWindowTitle) withObject:nil waitUntilDone:NO];
[pool drain];
}
View
4 Vienna.xcodeproj/project.pbxproj
@@ -4047,7 +4047,7 @@
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = ViennaBeta;
SDKROOT = macosx;
- VIENNA_VERSION_NUMBER = 2808;
+ VIENNA_VERSION_NUMBER = 2809;
WRAPPER_EXTENSION = app;
};
name = Development;
@@ -4075,7 +4075,7 @@
PRODUCT_NAME = ViennaBeta;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;
- VIENNA_VERSION_NUMBER = 2808;
+ VIENNA_VERSION_NUMBER = 2809;
WRAPPER_EXTENSION = app;
};
name = Deployment;
Please sign in to comment.
Something went wrong with that request. Please try again.