-
sullivan authored
- WebKit part of fix for 3124949 -- Alexander recreates the default set of bookmarks every time a separate app copy is launched Reviewed by Darin * Bookmarks.subproj/WebBookmarkGroup.h: new _tag ivar and -tag method. * Bookmarks.subproj/WebBookmarkGroup.m: (-[WebBookmarkGroup dealloc]): release _tag (-[WebBookmarkGroup tag]): return _tag (-[WebBookmarkGroup _loadBookmarkGroupGuts]): read _tag from the dictionary in the file (or leave it at nil if there's no value in the file). * English.lproj/StringsNotToBeLocalized.txt: kept this file up to date WebBrowser: - WebBrowser part of fix for 3124949 -- Alexander recreates the default set of bookmarks every time a separate app copy is launched Reviewed by Darin * BookmarksController.m: (-[BookmarksController mergeBuiltInBookmarksIfNecessary]): if the mod date has changed since the last time this was checked, check the tag in the bookmarks group (loaded from the file) to see if it has changed. If the tag hasn't changed, then don't merge the built-in bookmarks. * PreferenceKeys.h: new #define BuiltInBookmarksTagPreferenceKey * English.lproj/BuiltInBookmarks.plist: Added tag (happens to be string that looks like a date) to this file. We'll update this whenever we update the contents. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3144 268f45cc-cd09-0410-ab3c-d52691b4dbfc
68d6d24d