Merging upstream version 4.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 40 insertions, 13 deletions

diff --git a/content/HttpRequest.jsm b/content/HttpRequest.jsm
index fa28f97..0478336 100644
--- a/content/HttpRequest.jsm
+++ b/content/HttpRequest.jsm
@@ -34,7 +34,9 @@ var bug669675 = [];
 var containers = [];
 var sandboxes = {};
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 
 var HttpRequest = class {
     constructor() {
diff --git a/content/OverlayManager.jsm b/content/OverlayManager.jsm
index a0c18d6..e9c699b 100644
--- a/content/OverlayManager.jsm
+++ b/content/OverlayManager.jsm
@@ -11,7 +11,9 @@
 var EXPORTED_SYMBOLS = ["OverlayManager"];
 
 var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 
 function OverlayManager(extension, options = {}) {
   this.registeredOverlays = {};
diff --git a/content/api/BootstrapLoader/CHANGELOG.md b/content/api/BootstrapLoader/CHANGELOG.md
index 5006ecf..edc0639 100644
--- a/content/api/BootstrapLoader/CHANGELOG.md
+++ b/content/api/BootstrapLoader/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version: 1.22
+-------------
+- adjusted to Thunderbird Supernova (Services is now in globalThis)
+
 Version: 1.21
 -------------
 - Explicitly set hasAddonManagerEventListeners flag to false on uninstall
diff --git a/content/api/BootstrapLoader/implementation.js b/content/api/BootstrapLoader/implementation.js
index 03e6b76..82e03d5 100644
--- a/content/api/BootstrapLoader/implementation.js
+++ b/content/api/BootstrapLoader/implementation.js
@@ -2,7 +2,7 @@
  * This file is provided by the addon-developer-support repository at
  * https://github.com/thundernest/addon-developer-support
  *
- * Version: 1.21
+ * Version 1.22
  *
  * Author: John Bieling (john@thunderbird.net)
  *
@@ -15,7 +15,8 @@
 var { ExtensionCommon } = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
 var { ExtensionSupport } = ChromeUtils.import("resource:///modules/ExtensionSupport.jsm");
 var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || 
+  ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
 
 function getThunderbirdVersion() {
   let parts = Services.appinfo.version.split(".");
diff --git a/content/manager/accountManager.js b/content/manager/accountManager.js
index d442222..2779a4f 100644
--- a/content/manager/accountManager.js
+++ b/content/manager/accountManager.js
@@ -8,7 +8,9 @@
  
  "use strict";
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 var { TbSync } = ChromeUtils.import("chrome://tbsync/content/tbsync.jsm");
 
 var tbSyncAccountManager = {
diff --git a/content/manager/accounts.js b/content/manager/accounts.js
index 45774b1..e284f5d 100644
--- a/content/manager/accounts.js
+++ b/content/manager/accounts.js
@@ -8,7 +8,9 @@
  
  "use strict";
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 var { TbSync } = ChromeUtils.import("chrome://tbsync/content/tbsync.jsm");
 
 var tbSyncAccounts = {
diff --git a/content/manager/editAccount.js b/content/manager/editAccount.js
index ff4db50..481fd0b 100644
--- a/content/manager/editAccount.js
+++ b/content/manager/editAccount.js
@@ -8,7 +8,9 @@
  
  "use strict";
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 var { TbSync } = ChromeUtils.import("chrome://tbsync/content/tbsync.jsm");
 
 var tbSyncAccountSettings = {
diff --git a/content/manager/eventlog/eventlog.js b/content/manager/eventlog/eventlog.js
index eaa0b47..49bfa14 100644
--- a/content/manager/eventlog/eventlog.js
+++ b/content/manager/eventlog/eventlog.js
@@ -8,7 +8,9 @@
  
  "use strict";
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 var { TbSync } = ChromeUtils.import("chrome://tbsync/content/tbsync.jsm");
 
 var tbSyncEventLog = {
diff --git a/content/scripts/bootstrap.js b/content/scripts/bootstrap.js
index 706946f..71949cf 100644
--- a/content/scripts/bootstrap.js
+++ b/content/scripts/bootstrap.js
@@ -6,7 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
  */
  
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 
 function startup(data, reason) {
   // possible reasons: APP_STARTUP, ADDON_ENABLE, ADDON_INSTALL, ADDON_UPGRADE, or ADDON_DOWNGRADE.
diff --git a/content/tbsync.jsm b/content/tbsync.jsm
index e31931d..659ada2 100644
--- a/content/tbsync.jsm
+++ b/content/tbsync.jsm
@@ -10,7 +10,9 @@
 
 var EXPORTED_SYMBOLS = ["TbSync"];
 
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var Services = globalThis.Services || ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+).Services;
 var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
 var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
diff --git a/manifest.json b/manifest.json
index 54338cc..46a6798 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,13 +2,13 @@
   "applications": {
     "gecko": {
       "id": "tbsync@jobisoft.de",
-      "strict_min_version": "102.3.0",
+      "strict_min_version": "115.0",
       "strict_max_version": "115.*"
     }
   },
   "manifest_version": 2,
   "name": "TbSync",
-  "version": "4.7",
+  "version": "4.8",
   "author": "John Bieling",
   "homepage_url": "https://github.com/jobisoft/TbSync",
   "default_locale": "en-US",
@@ -21,7 +21,13 @@
     "default_label": "",
     "default_icon": {
       "32": "content/skin/tbsync.png"
-    }
+    },
+    "allowed_spaces": [
+      "mail",
+      "calendar",
+      "addressbook",
+      "tasks"
+    ]
   }, 
   "background": {
     "scripts": ["background.js"]