From ed0e83a4f0fa859b475e54902eb228f154edfd7d Mon Sep 17 00:00:00 2001 From: "alqahira%ardisson.org" Date: Mon, 22 Dec 2008 18:57:25 +0000 Subject: [PATCH] Bug 469037 - Support the import of SeaMonkey bookmarks.html. r=cl, sr=smorgan git-svn-id: svn://10.0.0.236/trunk@255618 18797224-902f-48f8-a5cc-f745e15eee43 --- .../camino/src/bookmarks/BookmarkImportDlgController.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/camino/src/bookmarks/BookmarkImportDlgController.mm b/mozilla/camino/src/bookmarks/BookmarkImportDlgController.mm index 8fab48cb89d..857015d94df 100644 --- a/mozilla/camino/src/bookmarks/BookmarkImportDlgController.mm +++ b/mozilla/camino/src/bookmarks/BookmarkImportDlgController.mm @@ -92,8 +92,14 @@ mozPath = [self saltedBookmarkPathForProfile:@"~/Library/Mozilla/Profiles/default/"]; if (mozPath) - [self tryAddImportFromBrowser:@"Netscape/Mozilla" withBookmarkPath:mozPath]; + [self tryAddImportFromBrowser:@"Netscape/Mozilla/SeaMonkey 1.x" withBookmarkPath:mozPath]; + // SeaMonkey 1.x used the same profile as Netscape/Mozilla; SeaMonkey 2 + // introduced a unique profile location. + mozPath = [self saltedBookmarkPathForProfile:@"~/Library/Application Support/SeaMonkey/Profiles/"]; + if (mozPath) + [self tryAddImportFromBrowser:@"SeaMonkey 2" withBookmarkPath:mozPath]; + // Try Firefox from different locations in the reverse order of their introduction mozPath = [self saltedBookmarkPathForProfile:@"~/Library/Application Support/Firefox/Profiles/"]; if (!mozPath)