libunbound: Fix incompatibility with Thunderbird 115 (#364)

lieser · Jun 3, 2023 · fc2bf94 · fc2bf94
1 parent e57dff8
commit fc2bf94
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/experiments/libunbound.js b/experiments/libunbound.js
@@ -22,7 +22,11 @@
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 // @ts-expect-error
 // eslint-disable-next-line no-var
-var { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+var OS;
+if (typeof PathUtils === "undefined") {
+	// TB < 115
+	({ OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"));
+}
 
 /**
  * The result of the query.
@@ -119,7 +123,12 @@ class LibunboundWorker {
 		if (this.config.pathRelToProfileDir) {
 			path = this.config.path.
 				split(";").
-				map(e => { return OS.Path.join(OS.Constants.Path.profileDir, e); }).
+				map(e => {
+					if (OS) {
+						return OS.Path.join(OS.Constants.Path.profileDir, e);
+					}
+					return PathUtils.join(PathUtils.profileDir, e);
+				}).
 				join(";");
 		} else {
 			path = this.config.path;

diff --git a/experiments/mozilla.d.ts b/experiments/mozilla.d.ts
@@ -161,7 +161,7 @@ declare module FileUtils {
     function File(path: string): nsIFile;
 }
 
-/** JavaScript code module "resource://gre/modules/osfile.jsm" */
+/** JavaScript code module "resource://gre/modules/osfile.jsm" (removed in TB >= 115) */
 declare module OS {
     declare module Path {
         function join(path1: string, path2: string, ...paths: string[]): string;
@@ -174,6 +174,13 @@ declare module OS {
     }
 }
 
+/** https://searchfox.org/mozilla-central/source/dom/chrome-webidl/PathUtils.webidl */
+declare module PathUtils {
+    function join(path1: string, path2: string, ...paths: string[]): string;
+
+    const profileDir: string;
+}
+
 /** JavaScript code module "resource://gre/modules/Services.jsm" */
 declare module Services {
     const appinfo: nsIXULAppInfo;