gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 20:22:26 +01:00
Code Issues Projects Releases Wiki Activity

Undo certain parts from the unfortunate "service" commit, to unbreak Muttator. @Kris: Please try not to

Browse Source 
commit unconnected things at once, as it's much harder to revert such commits :( I'll have to revert
the service -> Cc/Ci manually now, as I got lots of conflicts in reverting, and if i didn't, i wouldn't
want to undo the other parts of that commit (like VIMPERATOR_RUNTIME or the added comments)
This commit is contained in:
Martin Stubenschrott
2008-12-23 03:10:01 +01:00
parent 90d7eb0d17
commit feeccb23d2
10 changed files with 72 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vimperator/content/bookmarks.js
View File

@@ -60,7 +60,6 @@ function Bookmarks() //{{{
const bookmarksService = PlacesUtils.bookmarks;
const taggingService = PlacesUtils.tagging;
const searchService = service.browserSearch;
const ioService = service.io;
const faviconService = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService);
const Bookmark = new Struct("url", "title", "icon", "keyword", "tags", "id");
@@ -91,7 +90,7 @@ function Bookmarks() //{{{
function loadBookmark(node)
{
let uri = ioService.newURI(node.uri, null, null);
let uri = util.newURI(node.uri);
let keyword = bookmarksService.getKeywordForBookmark(node.itemId);
let tags = taggingService.getTagsForURI(uri, {}) || [];
@@ -199,7 +198,7 @@ function Bookmarks() //{{{
if (bookmark)
{
if (property == "tags")
value = taggingService.getTagsForURI(ioService.newURI(bookmark.url, null, null), {});
value = taggingService.getTagsForURI(util.newURI(bookmark.url), {});
if (property in bookmark)
bookmark[property] = value;
storage.fireEvent(name, "change", itemId);
@@ -220,7 +219,7 @@ function Bookmarks() //{{{
{
try
{
return faviconService.getFaviconImageForPage(ioService.newURI(uri, null, null)).spec;
return faviconService.getFaviconImageForPage(util.newURI(uri)).spec;
}
catch (e)
{
@@ -487,7 +486,7 @@ function Bookmarks() //{{{
{
try
{
var uri = ioService.newURI(url, null, null);
var uri = util.newURI(url);
return (bookmarksService.getBookmarkedURIFor(uri) != null);
}
catch (e)
@@ -505,7 +504,7 @@ function Bookmarks() //{{{
var i = 0;
try
{
var uri = ioService.newURI(url, null, null);
var uri = util.newURI(url);
var count = {};
var bmarks = bookmarksService.getBookmarkIdsForURI(uri, count);