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

fix bug 265503 - firefox bookmark importing fixes. sr=pinkerton

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165534 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
joshmoz%gmail.com
2004-11-20 00:39:13 +00:00
parent 7716a66257
commit cf82bbbca4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/camino/src/bookmarks/BookmarkManager.mm
View File

@@ -791,15 +791,19 @@ static unsigned gFirstUserCollection = 0;
currentItem = [currentArray addBookmark];
[(Bookmark *)currentItem setUrl:[tempItem stringByRemovingAmpEscapes]];
[tokenScanner scanUpToString:@">" intoString:&tempItem];
[currentItem setTitle:[[tokenString substringFromIndex:([tokenScanner scanLocation]+1)] stringByRemovingAmpEscapes]];
justSetTitle = YES;
if (![tokenScanner isAtEnd]) { // protect against malformed files
[currentItem setTitle:[[tokenString substringFromIndex:([tokenScanner scanLocation]+1)] stringByRemovingAmpEscapes]];
justSetTitle = YES;
}
// see if we had a keyword
if (isNetscape) {
tempRange = [tempItem rangeOfString:@"SHORTCUTURL=\"" options: NSCaseInsensitiveSearch];
if (tempRange.location != NSNotFound) {
// throw everything to next " into keyword
// throw everything to next " into keyword. A malformed bookmark might not have a closing " which
// will throw things out of whack slightly, but it's better than crashing.
keyRange = [tempItem rangeOfString:@"\"" options:0 range:NSMakeRange(tempRange.location+tempRange.length,[tempItem length]-(tempRange.location+tempRange.length))];
[currentItem setKeyword:[tempItem substringWithRange:NSMakeRange(tempRange.location+tempRange.length,keyRange.location - (tempRange.location+tempRange.length))]];
if (keyRange.location != NSNotFound)
[currentItem setKeyword:[tempItem substringWithRange:NSMakeRange(tempRange.location+tempRange.length,keyRange.location - (tempRange.location+tempRange.length))]];
}
}
}