[Pkg-mozext-commits] [greasemonkey] 07/19: The same function names

[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 8be23b4ad7e798c04c9296b0aab5cbd13789109c
Author: janekptacijarabaci <janekptacijarabaci at seznam.cz>
Date:   Sat Apr 9 11:29:44 2016 +0200

    The same function names
---
 modules/sandbox.js                                | 2 +-
 modules/util.js                                   | 2 +-
 modules/util/{isPrivate.js => windowIsPrivate.js} | 4 ++--
 modules/xmlhttprequester.js                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/sandbox.js b/modules/sandbox.js
index a7a82c4..64e3a0b 100644
--- a/modules/sandbox.js
+++ b/modules/sandbox.js
@@ -133,7 +133,7 @@ function injectGMInfo(aScript, sandbox, aContentWin) {
   var rawInfo = aScript.info();
   var scriptURL = aScript.fileURL;
 
-  rawInfo.isIncognito = GM_util.isPrivate(aContentWin);
+  rawInfo.isIncognito = GM_util.windowIsPrivate(aContentWin);
   rawInfo.isPrivate = rawInfo.isIncognito;
   
   // TODO: also delay top level clone via lazy getter? XPCOMUtils.defineLazyGetter
diff --git a/modules/util.js b/modules/util.js
index 694c2a3..39b2456 100644
--- a/modules/util.js
+++ b/modules/util.js
@@ -45,7 +45,6 @@ XPCOMUtils.defineLazyModuleGetter(GM_util, 'hitch', 'chrome://greasemonkey-modul
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'inArray', 'chrome://greasemonkey-modules/content/util/inArray.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'installScriptFromSource', 'chrome://greasemonkey-modules/content/util/installScriptFromSource.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'isGreasemonkeyable', 'chrome://greasemonkey-modules/content/util/isGreasemonkeyable.js');
-XPCOMUtils.defineLazyModuleGetter(GM_util, 'isPrivate', 'chrome://greasemonkey-modules/content/util/isPrivate.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'logError', 'chrome://greasemonkey-modules/content/util/logError.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'memoize', 'chrome://greasemonkey-modules/content/util/memoize.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'newUserScript', 'chrome://greasemonkey-modules/content/util/newUserScript.js');
@@ -64,4 +63,5 @@ XPCOMUtils.defineLazyModuleGetter(GM_util, 'uuid', 'chrome://greasemonkey-module
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowIdForEvent', 'chrome://greasemonkey-modules/content/util/windowIdForEvent.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowId', 'chrome://greasemonkey-modules/content/util/windowId.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowIsClosed', 'chrome://greasemonkey-modules/content/util/windowIsClosed.js');
+XPCOMUtils.defineLazyModuleGetter(GM_util, 'windowIsPrivate', 'chrome://greasemonkey-modules/content/util/windowIsPrivate.js');
 XPCOMUtils.defineLazyModuleGetter(GM_util, 'writeToFile', 'chrome://greasemonkey-modules/content/util/writeToFile.js');
diff --git a/modules/util/isPrivate.js b/modules/util/windowIsPrivate.js
similarity index 82%
rename from modules/util/isPrivate.js
rename to modules/util/windowIsPrivate.js
index 817404c..4837b63 100644
--- a/modules/util/isPrivate.js
+++ b/modules/util/windowIsPrivate.js
@@ -1,9 +1,9 @@
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-var EXPORTED_SYMBOLS = ["isPrivate"];
+var EXPORTED_SYMBOLS = ["windowIsPrivate"];
 
 
-function isPrivate(aContentWin) {
+function windowIsPrivate(aContentWin) {
   var isPrivate = true;
   if (PrivateBrowsingUtils.isContentWindowPrivate) {
     // Firefox >= 35
diff --git a/modules/xmlhttprequester.js b/modules/xmlhttprequester.js
index 14166f8..fc6adfc 100644
--- a/modules/xmlhttprequester.js
+++ b/modules/xmlhttprequester.js
@@ -128,7 +128,7 @@ function(safeUrl, details, req) {
 
   var channel;
 
-  if (GM_util.isPrivate(this.wrappedContentWin)) {
+  if (GM_util.windowIsPrivate(this.wrappedContentWin)) {
     channel = req.channel
         .QueryInterface(Components.interfaces.nsIPrivateBrowsingChannel);
     channel.setPrivate(true);

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