[Pkg-mozext-commits] [greasemonkey] 24/43: Fix references to refactored GM_ScriptStorage().

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit 432595e154a791a8601bc966f640899f4e702ef3
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Nov 19 16:48:00 2014 -0500

    Fix references to refactored GM_ScriptStorage().
    
    Refs #2004
---
 modules/script.js | 3 ++-
 modules/stats.js  | 7 ++++---
 modules/sync.js   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/script.js b/modules/script.js
index a47c1d3..6303126 100644
--- a/modules/script.js
+++ b/modules/script.js
@@ -11,6 +11,7 @@ Components.utils.import('resource://greasemonkey/prefmanager.js');
 Components.utils.import('resource://greasemonkey/scriptIcon.js');
 Components.utils.import('resource://greasemonkey/scriptRequire.js');
 Components.utils.import('resource://greasemonkey/scriptResource.js');
+Components.utils.import("resource://greasemonkey/storageBack.js");
 Components.utils.import('resource://greasemonkey/third-party/MatchPattern.js');
 Components.utils.import('resource://greasemonkey/third-party/convert2RegExp.js');
 Components.utils.import('resource://greasemonkey/util.js');
@@ -905,7 +906,7 @@ Script.prototype.uninstall = function(forUpdate) {
   }
 
   if (!forUpdate) {
-    var storage = new GM_ScriptStorage(this);
+    var storage = new GM_ScriptStorageBack(this);
     var file = storage.dbFile;
     GM_util.enqueueRemoveFile(file);
     file.leafName += '-journal';
diff --git a/modules/stats.js b/modules/stats.js
index 997d0f6..578d28f 100644
--- a/modules/stats.js
+++ b/modules/stats.js
@@ -12,6 +12,7 @@ Components.utils.import('resource://services-common/utils.js');
 Components.utils.import('resource://greasemonkey/miscapis.js');
 Components.utils.import('resource://greasemonkey/parseScript.js');
 Components.utils.import('resource://greasemonkey/prefmanager.js');
+Components.utils.import("resource://greasemonkey/storageBack.js");
 Components.utils.import('resource://greasemonkey/util.js');
 
 var gPrefMan = new GM_PrefManager();
@@ -24,11 +25,11 @@ var gTldService = Components
     .getService(Components.interfaces.nsIEffectiveTLDService);
 
 // Check once, soon.
-GM_util.timeout(check, 1000 * 10) // ms = 10 seconds
+GM_util.timeout(check, 1000 * 10); // ms = 10 seconds
 // And forever, as long as the browser stays open.
 GM_util.timeout(
     check, 1000 * 60 * 60,  // ms = 1 hour
-    Components.interfaces.nsITimer.TYPE_REPEATING_PRECISE_CAN_SKIP)
+    Components.interfaces.nsITimer.TYPE_REPEATING_PRECISE_CAN_SKIP);
 
 
 function check() {
@@ -107,7 +108,7 @@ function getStatsObj() {
 
   var scripts = GM_util.getService().config.scripts;
   for (var i = 0, script = null; script = scripts[i]; i++) {
-    var valueStats = GM_ScriptStorage(script).getStats();
+    var valueStats = GM_ScriptStorageBack(script).getStats();
 
     var downloadUri = GM_util.uriFromUrl(script.downloadURL);
     var domain = null;
diff --git a/modules/sync.js b/modules/sync.js
index 2fd0659..c724ba6 100644
--- a/modules/sync.js
+++ b/modules/sync.js
@@ -10,6 +10,7 @@ Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://services-crypto/utils.js');
 Cu.import("resource://greasemonkey/miscapis.js");
 Cu.import('resource://greasemonkey/prefmanager.js');
+Cu.import("resource://greasemonkey/storageBack.js");
 Cu.import('resource://greasemonkey/util.js');
 
 
@@ -128,7 +129,7 @@ ScriptStore.prototype = {
       record.cleartext.userIncludes = script.userIncludes;
 
       if (GM_prefRoot.getValue('sync.values')) {
-        var storage = new GM_ScriptStorage(script);
+        var storage = new GM_ScriptStorageBack(script);
         var totalSize = 0;
         var maxSize = GM_prefRoot.getValue('sync.values_max_size_per_script');
         record.cleartext.values = {};
@@ -261,7 +262,7 @@ function setScriptValuesFromSyncRecord(aScript, aRecord) {
       && !aRecord.cleartext.valuesTooBig
   ) {
     // TODO: Clear any locally set values not in the sync record?
-    var storage = new GM_ScriptStorage(aScript);
+    var storage = new GM_ScriptStorageBack(aScript);
     for (name in aRecord.cleartext.values) {
       storage.setValue(name, aRecord.cleartext.values[name]);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git