Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

411664 Bookmarks don't show up in the Bookmarks menu, but show up in Manage Bookmarks. Regressed in 411338. r=smorgan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242841 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mark%moxienet.com
2008-01-10 18:40:43 +00:00
parent 514363bc44
commit 9a90cf8681
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/camino/src/bookmarks/Bookmark.mm
View File

@@ -150,7 +150,7 @@ NSString* const URLLoadSuccessKey = @"url_bool";
- (NSString *)url
{
return mURL;
return mURL ? mURL : @"";
}
- (NSImage *)icon
@@ -469,12 +469,11 @@ NSString* const URLLoadSuccessKey = @"url_bool";
if ([aItem isKindOfClass:[BookmarkFolder class]])
result = NSOrderedDescending;
else {
int myVisits = [self numberOfVisits];
int otherVisits = [(Bookmark*)aItem numberOfVisits];
if (myVisits == otherVisits)
unsigned int otherVisits = [(Bookmark*)aItem numberOfVisits];
if (mNumberOfVisits == otherVisits)
result = NSOrderedSame;
else
result = (otherVisits > myVisits) ? NSOrderedAscending : NSOrderedDescending;
result = (otherVisits > mNumberOfVisits) ? NSOrderedAscending : NSOrderedDescending;
}
return [inDescending boolValue] ? (NSComparisonResult)(-1 * (int)result) : result;
@@ -484,10 +483,20 @@ NSString* const URLLoadSuccessKey = @"url_bool";
{
NSComparisonResult result;
// sort categories before sites
if ([aItem isKindOfClass:[BookmarkFolder class]])
if ([aItem isKindOfClass:[BookmarkFolder class]]) {
result = NSOrderedDescending;
else
result = [mLastVisit compare:[(Bookmark*)aItem lastVisit]];
}
else {
NSDate* otherLastVisit = [(Bookmark*)aItem lastVisit];
if (mLastVisit && otherLastVisit)
result = [mLastVisit compare:otherLastVisit];
else if (mLastVisit)
result = NSOrderedDescending;
else if (otherLastVisit)
result = NSOrderedAscending;
else
result = NSOrderedSame;
}
return [inDescending boolValue] ? (NSComparisonResult)(-1 * (int)result) : result;
}
@@ -499,12 +508,11 @@ NSString* const URLLoadSuccessKey = @"url_bool";
if ([aItem isKindOfClass:[BookmarkFolder class]])
result = NSOrderedDescending;
else {
int myVisits = [self numberOfVisits];
int otherVisits = [(Bookmark*)aItem numberOfVisits];
if (myVisits == otherVisits)
result = [mLastVisit compare:[(Bookmark*)aItem lastVisit]];
unsigned int otherVisits = [(Bookmark*)aItem numberOfVisits];
if (mNumberOfVisits == otherVisits)
return [self compareLastVisitDate:aItem sortDescending:inDescending];
else
result = (otherVisits > myVisits) ? NSOrderedAscending : NSOrderedDescending;
result = (otherVisits > mNumberOfVisits) ? NSOrderedAscending : NSOrderedDescending;
}
return [inDescending boolValue] ? (NSComparisonResult)(-1 * (int)result) : result;