[Pkg-mozext-commits] [requestpolicy] 55/100: bugfix

[David Prévot]

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit ed6c43540512653354a77fe69c2cf17b9a29f682
Author: myrdd <myrdd at users.noreply.github.com>
Date:   Sun Oct 5 00:58:41 2014 +0200

    bugfix
---
 src/content/menu.js         | 4 +++-
 src/modules/GUILocation.jsm | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/content/menu.js b/src/content/menu.js
index cc3fb13..1e2fcc9 100644
--- a/src/content/menu.js
+++ b/src/content/menu.js
@@ -750,6 +750,7 @@ requestpolicy.menu = {
       } else {
         properties = guiOrigins[guiOriginsIndex].properties;
       }
+      var addThisOriginBase = false;
 
       for (var destBase in allRequests[originUri]) {
         // Search for a destBase which wouldn't be allowed by the default policy.
@@ -763,10 +764,11 @@ requestpolicy.menu = {
         if (allowSameDomain && destBase == originBase) {
           continue;
         }
+        addThisOriginBase = true;
         properties.accumulate(allRequests[originUri][destBase]);
       }
 
-      if (guiOriginsIndex == -1) {
+      if (addThisOriginBase && guiOriginsIndex == -1) {
         guiOrigins.push(new rp.mod.GUIOrigin(originBase, properties));
       }
     }
diff --git a/src/modules/GUILocation.jsm b/src/modules/GUILocation.jsm
index c1c70d5..3834a94 100644
--- a/src/modules/GUILocation.jsm
+++ b/src/modules/GUILocation.jsm
@@ -89,7 +89,7 @@ GUILocation.indexOfLocationInArray = function (locationString, locations) {
  * @static
  */
 GUILocation.sortByNumRequestsCompareFunction = function (a, b) {
-  return GUIDestination.compareFunction(a, b, "sortByNumRequests");
+  return GUILocation.compareFunction(a, b, "sortByNumRequests");
 };
 GUILocation.compareFunction = function (a, b, sortType) {
   var a_default = (a.properties.numDefaultPolicyRequests > 0);

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