1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-09 20:45:46 +01:00

Closes issue #925.

--HG--
extra : source : 4cc88ef4f1f032faef1d49959de12003e905a9e9
This commit is contained in:
Kris Maglione
2012-10-02 18:55:47 -07:00
parent 53f3ea342c
commit ad552d2986
3 changed files with 4 additions and 153 deletions

View File

@@ -26,7 +26,6 @@ var Services = Module("Services", {
this.add("appShell", "@mozilla.org/appshell/appShellService;1", "nsIAppShellService");
this.add("appStartup", "@mozilla.org/toolkit/app-startup;1", "nsIAppStartup");
this.add("bookmarks", "@mozilla.org/browser/nav-bookmarks-service;1", "nsINavBookmarksService");
this.add("bootstrap", "@dactyl.googlecode.com/base/bootstrap");
this.add("browserSearch", "@mozilla.org/browser/search-service;1", "nsIBrowserSearchService");
this.add("cache", "@mozilla.org/network/cache-service;1", "nsICacheService");
this.add("charset", "@mozilla.org/charset-converter-manager;1", "nsICharsetConverterManager");

View File

@@ -182,9 +182,10 @@ var Storage = Module("Storage", {
init: function () {
this.cleanup();
if (services.bootstrap && !services.bootstrap.session)
services.bootstrap.session = {};
this.session = services.bootstrap ? services.bootstrap.session : {};
let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
if (!Services.dactylSession)
Services.dactylSession = {};
this.session = Services.dactylSession;
},
cleanup: function () {