Merge branch 'feature/restartless' of https://github.com/anantn/f1 into feature/restartless

Conflicts:
	extensions/firefox-share/src/modules/panel.js
This commit is contained in:
Shane Caraveo 2011-03-15 18:10:21 -07:00
Родитель b0a8782bd3 7de9bbe679
Коммит 2daa92970d
1 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -201,10 +201,12 @@ sharePanel.prototype = {
let tags = ['shared', 'f1', data.service];
let nsiuri = Services.io.newURI(data.url, null, null);
Services.bookmarks.insertBookmark(
Services.bookmarks.unfiledBookmarksFolder, nsiuri,
Services.bookmarks.DEFAULT_INDEX, this.getPageTitle().trim()
);
if (!Services.bookmarks.isBookmarked(nsiuri)) {
Services.bookmarks.insertBookmark(
Services.bookmarks.unfiledBookmarksFolder, nsiuri,
Services.bookmarks.DEFAULT_INDEX, this.getPageTitle().trim()
);
}
PlacesUtils.tagging.tagURI(nsiuri, tags);
}
},