Fixes #129: Not defining Services anymore, it's automatically defin…

…ed globally with recent TB versions
eyalroz · Jul 29, 2024 · 963fd0b · 963fd0b
1 parent 01bf845
commit 963fd0b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 9 deletions.
diff --git a/src/api/WindowListener/implementation.js b/src/api/WindowListener/implementation.js
@@ -18,8 +18,6 @@ var { ExtensionCommon } = ChromeUtils.import(
 var { ExtensionSupport } = ChromeUtils.import(
   "resource:///modules/ExtensionSupport.jsm"
 );
-var Services = globalThis.Services ||
-  ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
 
 function getThunderbirdVersion() {
   let parts = Services.appinfo.version.split(".");
@@ -401,8 +399,6 @@ var WindowListener_102 = class extends ExtensionCommon.ExtensionAPI {
           let url = context.extension.rootURI.resolve(defaultUrl);
 
           let prefsObj = {};
-          prefsObj.Services = globalThis.Services||
-            ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
           prefsObj.pref = function (aName, aDefault) {
             let defaults = Services.prefs.getDefaultBranch("");
             switch (typeof aDefault) {

diff --git a/src/chrome/content/bidimailui-composer.js b/src/chrome/content/bidimailui-composer.js
@@ -1,4 +1,3 @@
-var Services = globalThis.Services;
 var { MailServices } = ChromeUtils.importESModule("resource:///modules/MailServices.sys.mjs");
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 

diff --git a/src/chrome/content/bidimailui-editor.js b/src/chrome/content/bidimailui-editor.js
@@ -1,4 +1,3 @@
-var Services = globalThis.Services;
 const { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 BiDiMailUI.Editor = {};

diff --git a/src/chrome/content/bidimailui-messenger.js b/src/chrome/content/bidimailui-messenger.js
@@ -1,4 +1,3 @@
-var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 // This file constains UI and glue code only, calling

diff --git a/src/chrome/content/overlay-injectors/3pane.js b/src/chrome/content/overlay-injectors/3pane.js
@@ -1,4 +1,3 @@
-var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 // Note: There are some duplicates with injections from messenger.js, as those are not (easily) accessible

diff --git a/src/chrome/content/overlay-injectors/messengercompose.js b/src/chrome/content/overlay-injectors/messengercompose.js
@@ -1,4 +1,3 @@
-var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 const debugInjection = false;