[Pkg-mozext-commits] [tabmixplus] 06/20: Cannot open Bookmarks in Firefox 57, Follow up bug 1405687 - Remove some deprecated code from Places related code

[David Prévot]

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

taffit pushed a commit to branch master
in repository tabmixplus.

commit 951252a2ea5518ce20938ad70f264659fbee41eb
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Oct 9 14:11:01 2017 +0300

    Cannot open Bookmarks in Firefox 57, Follow up bug 1405687 - Remove some deprecated code from Places related code
---
 modules/Places.jsm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/Places.jsm b/modules/Places.jsm
index 7ef6bc9..64fe658 100644
--- a/modules/Places.jsm
+++ b/modules/Places.jsm
@@ -24,6 +24,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUIUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
   "resource://gre/modules/PlacesUtils.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
+  "resource:///modules/RecentWindow.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this,
   "TabmixSvc", "resource://tabmixplus/TabmixSvc.jsm");
 
@@ -73,6 +76,9 @@ PlacesUtilsInternal = {
       delete PlacesUIUtils["tabmix_" + aFn];
     });
     delete PlacesUIUtils.tabmix_getURLsForContainerNode;
+    if (TabmixSvc.version(580)) {
+      delete PlacesUIUtils._getTopBrowserWin;
+    }
   },
 
   functions: ["_openTabset", "openURINodesInTabs", "openContainerNodeInTabs", "openNodeWithEvent", "_openNodeIn"],
@@ -195,6 +201,12 @@ PlacesUtilsInternal = {
       'bookMarkId: aNode.itemId, initiatingDoc: null,\n' +
       '        $&'
     ).toCode();
+
+    if (TabmixSvc.version(580)) {
+      PlacesUIUtils._getTopBrowserWin = function PUIU__getTopBrowserWin() {
+        return RecentWindow.getMostRecentBrowserWindow();
+      };
+    }
   },
 
   // Lazy getter for titlefrombookmark preference

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