[Pkg-mozext-commits] [adblock-plus] 18/28: Issue 1479 - nss3 library isn't being found on OS X

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus.

commit 58c67b4da9c5050df279b2f9924d01611b779868
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Oct 15 13:07:30 2014 +0200

    Issue 1479 - nss3 library isn't being found on OS X
---
 lib/utils.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/utils.js b/lib/utils.js
index 20e613c..8ad584c 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -631,7 +631,12 @@ XPCOMUtils.defineLazyGetter(Utils, "crypto", function()
     catch (e)
     {
       // It seems that on Mac OS X the full path name needs to be specified
-      let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+      let file;
+      // Gecko 35 added GreBinD key, see https://bugzilla.mozilla.org/show_bug.cgi?id=1077099
+      if (Services.dirsvc.has("GreBinD"))
+        file = Services.dirsvc.get("GreBinD", Ci.nsILocalFile);
+      else
+        file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
       file.append(ctypes.libraryName("nss3"));
       nsslib = ctypes.open(file.path);
     }

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