Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 10:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 227257, top ten list should exclude the bookmarks manager page (about:bookmarks) and histroy (about:history). Patch by froodian <stridey@gmail.com>, r=smorgan, sr=pink.

Browse Source
This commit is contained in:
nick.kreeger%park.edu 2006-07-31 16:01:45 +00:00
parent 6e51e55997
commit 3132d3ecea
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
camino/src/bookmarks/KindaSmartFolderManager.mm
View File

@ -147,7 +147,6 @@ const unsigned kNumTop10Items = 10; // well, 10, duh!
// NSLog(@"checkForNewTop10 %@ (%d items)", aBookmark, [top10ItemsArray count]); // NSLog(@"checkForNewTop10 %@ (%d items)", aBookmark, [top10ItemsArray count]);
// if it's already in the list
unsigned curIndex = [top10ItemsArray indexOfObjectIdenticalTo:aBookmark]; unsigned curIndex = [top10ItemsArray indexOfObjectIdenticalTo:aBookmark];
unsigned visitCount = [aBookmark numberOfVisits]; unsigned visitCount = [aBookmark numberOfVisits];
@ -179,14 +178,20 @@ const unsigned kNumTop10Items = 10; // well, 10, duh!
} }
else if (visitCount >= currentMinVisits) else if (visitCount >= currentMinVisits)
{ {
// If bookmark is an about:URI, ignore it
NSString* newItemURL = [aBookmark url];
NSRange firstColon = [newItemURL rangeOfString:@":"];
// If there's a colon in the URI and everything up to it is "about", return
if((firstColon.location != NSNotFound) && [[newItemURL substringToIndex:firstColon.location] isEqual:@"about"])
return;
// enter it into the list using insertion sort. it will go before other items with the same visit // enter it into the list using insertion sort. it will go before other items with the same visit
// count (thus maintaining the visit count/last visit sort). // count (thus maintaining the visit count/last visit sort).
unsigned numItems = [top10ItemsArray count]; unsigned numItems = [top10ItemsArray count];
int insertionIndex = -1; int insertionIndex = -1;
NSString* newItemURL = [aBookmark url];
NSNumber* reverseSort = [NSNumber numberWithBool:YES]; NSNumber* reverseSort = [NSNumber numberWithBool:YES];
// we check the entire list to look for items with a duplicate url // we check the entire list to look for items with a duplicate url
for (unsigned i = 0; i < numItems; i ++) for (unsigned i = 0; i < numItems; i ++)
{ {
@ -198,7 +203,7 @@ const unsigned kNumTop10Items = 10; // well, 10, duh!
if (([aBookmark compareForTop10:curChild sortDescending:reverseSort] != NSOrderedDescending) && insertionIndex == -1) if (([aBookmark compareForTop10:curChild sortDescending:reverseSort] != NSOrderedDescending) && insertionIndex == -1)
insertionIndex = i; insertionIndex = i;
} }
if (insertionIndex == -1 && [top10ItemsArray count] < kNumTop10Items) if (insertionIndex == -1 && [top10ItemsArray count] < kNumTop10Items)
insertionIndex = [top10ItemsArray count]; insertionIndex = [top10ItemsArray count];