Skip to content

Commit d43d63b

Browse files
authored
Merge pull request #795 from thunderbird/v14.1.14
V14.1.14
2 parents fb89297 + 4a3b176 commit d43d63b

File tree

8 files changed

+12
-21
lines changed

8 files changed

+12
-21
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Versions
44

5+
Version 14.1.14 : Maintenance Release - September 16, 2025
6+
7+
- Fix race condition preventing auto backup on shutdown
8+
59
Version 14.1.13 : v140-v144 Release - September 8, 2025
610

711
- Compatibility for v140-v144

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "ImportExportTools NG",
33
"name": "import-export-tools-ng",
4-
"version": "14.1.13",
4+
"version": "14.1.14",
55
"description": "Import and export next-gen tools for messages and folders",
66
"author": "Christopher Leidigh",
77
"engines": {

src/chrome/content/mboximport/autobackup.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ImportExportTools NG is a derivative extension for Thunderbird 60+
33
providing import and export tools for messages and folders.
44
The derivative extension authors:
5-
Copyright (C) 2024 : Christopher Leidigh, The Thunderbird Team
5+
Copyright (C) 2025 : Christopher Leidigh, The Thunderbird Team
66
77
The original extension & derivatives, ImportExportTools, by Paolo "Kaosmos",
88
is covered by the GPLv3 open-source license (see LICENSE file).
@@ -302,6 +302,8 @@ var autoBackup = {
302302
},
303303

304304
scanExternal: function (destDir) {
305+
let { MailServices } = ChromeUtils.importESModule("resource:///modules/MailServices.sys.mjs");
306+
305307
var file = destDir.clone();
306308
file.append("ExternalMailFolders");
307309
if (!file.exists())

src/chrome/content/mboximport/autobackup.xhtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
<script type="application/javascript" src="./modules/i18n.js"/>
2323
<script type="application/javascript" src="./utils.js" />
24-
<script type="application/javascript" src="./mboximport.js" />
2524
<script type="application/javascript" src="./autobackup.js" />
2625

2726
</dialog>

src/chrome/content/mboximport/utils.js

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ImportExportTools NG is a derivative extension for Thunderbird 60+
33
providing import and export tools for messages and folders.
44
The derivative extension authors:
5-
Copyright (C) 2019 : Christopher Leidigh, The Thunderbird Team
5+
Copyright (C) 2025 : Christopher Leidigh, The Thunderbird Team
66
77
The original extension & derivatives, ImportExportTools, by Paolo "Kaosmos",
88
is covered by the GPLv3 open-source license (see LICENSE file).
@@ -37,24 +37,10 @@ GetSelectedMessages,
3737
IETstoreHeaders,
3838
*/
3939

40-
if (!ExtensionParent) {
41-
var { ExtensionParent } = ChromeUtils.importESModule(
42-
"resource://gre/modules/ExtensionParent.sys.mjs"
43-
);
44-
}
45-
46-
if (!ietngExtension) {
47-
var ietngExtension = ExtensionParent.GlobalManager.getExtension(
48-
"ImportExportToolsNG@cleidigh.kokkini.net"
49-
);
50-
}
51-
52-
if (!messengerWin) {
53-
var messengerWin = Services.wm.getMostRecentWindow("mail:3pane");
54-
}
40+
// Always load ietngUtils - we don't have access to extension.manifest.version
5541

5642
var { ietngUtils } = ChromeUtils.importESModule("chrome://mboximport/content/mboximport/modules/ietngUtils.mjs?"
57-
+ ietngExtension.manifest.version + messengerWin.ietngAddon.dateForDebugging);
43+
+ new Date());
5844

5945
var { strftime } = ChromeUtils.importESModule("chrome://mboximport/content/mboximport/modules/strftime.mjs");
6046
Services.scriptloader.loadSubScript("chrome://mboximport/content/mboximport/modules/latinize.js");

src/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 2,
33
"name": "__MSG_extensionName__",
4-
"version": "14.1.13",
4+
"version": "14.1.14",
55
"description": "__MSG_extensionDescription__",
66
"author": "Christopher Leidigh",
77
"applications": {
478 KB
Binary file not shown.
480 KB
Binary file not shown.

0 commit comments

Comments
 (0)