mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1595319 - Use new syntax for ChromeUtils.import. r=mkmelin 

Differential Revision: https://phabricator.services.mozilla.com/D63727

--HG--
extra : rebase_source : 67e831464661e7d624ec4b9cbfce4b33d6a81785
This commit is contained in:
Kai Engert 2020-02-21 22:57:21 +01:00
Родитель cadae5b145
Коммит f970e6c207
80 изменённых файлов: 773 добавлений и 809 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
mail/extensions/openpgp/content/BondOpenPGP.jsm
Просмотреть файл

@ -15,9 +15,9 @@ var { MailConstants } = ChromeUtils.import(
"resource:///modules/MailConstants.jsm"
);
const EnigmailLazy = ChromeUtils.import(
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getEnigmailApp = EnigmailLazy.loader("enigmail/app.jsm", "EnigmailApp");
const getEnigmailCore = EnigmailLazy.loader(

7
mail/extensions/openpgp/content/modules/amPrefsService.jsm
Просмотреть файл

@ -7,11 +7,10 @@
const { manager: Cm } = Components;
Cm.QueryInterface(Ci.nsIComponentRegistrar);
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
);
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const CATEGORY = "mailnews-accountmanager-extensions";
const CATEGORY_ENTRY = "openpgp-account-manager-extension";

7
mail/extensions/openpgp/content/modules/app.jsm
Просмотреть файл

@ -8,12 +8,11 @@
var EXPORTED_SYMBOLS = ["EnigmailApp"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLazy = ChromeUtils.import(
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getEnigmailLog = EnigmailLazy.loader("enigmail/log.jsm", "EnigmailLog");
var EnigmailApp = {

8
mail/extensions/openpgp/content/modules/armor.jsm
Просмотреть файл

@ -8,12 +8,12 @@
var EXPORTED_SYMBOLS = ["EnigmailArmor"];
const EnigmailConstants = ChromeUtils.import(
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
// Locates STRing in TEXT occurring only at the beginning of a line
function indexOfArmorDelimiter(text, str, offset) {

4
mail/extensions/openpgp/content/modules/attachment.jsm
Просмотреть файл

@ -8,9 +8,9 @@
var EXPORTED_SYMBOLS = ["EnigmailAttachment"];
const EnigmailCryptoAPI = ChromeUtils.import(
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
var EnigmailAttachment = {
getFileName(parent, byteData) {

46
mail/extensions/openpgp/content/modules/autoSetup.jsm
Просмотреть файл

@ -13,40 +13,40 @@
var EXPORTED_SYMBOLS = ["EnigmailAutoSetup"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailAutocrypt = ChromeUtils.import(
);
const { EnigmailAutocrypt } = ChromeUtils.import(
"chrome://openpgp/content/modules/autocrypt.jsm"
).EnigmailAutocrypt;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
const EnigmailWks = ChromeUtils.import(
);
const { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
const { EnigmailWks } = ChromeUtils.import(
"chrome://openpgp/content/modules/webKey.jsm"
).EnigmailWks;
const EnigmailTimer = ChromeUtils.import(
);
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
const EnigmailStreams = ChromeUtils.import(
);
const { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
const EnigmailGpg = ChromeUtils.import(
);
const { EnigmailGpg } = ChromeUtils.import(
"chrome://openpgp/content/modules/gpg.jsm"
).EnigmailGpg;
);
// Interfaces
const nsIMsgAccountManager = Ci.nsIMsgAccountManager;

50
mail/extensions/openpgp/content/modules/autocrypt.jsm
Просмотреть файл

@ -13,43 +13,43 @@ var EXPORTED_SYMBOLS = ["EnigmailAutocrypt"];
//Cu.importGlobalProperties(["crypto"]);
const jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
const EnigmailLog = ChromeUtils.import(
const { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailSqliteDb = ChromeUtils.import(
);
const { EnigmailSqliteDb } = ChromeUtils.import(
"chrome://openpgp/content/modules/sqliteDb.jsm"
).EnigmailSqliteDb;
const PromiseUtils = ChromeUtils.import(
);
const { PromiseUtils } = ChromeUtils.import(
"resource://gre/modules/PromiseUtils.jsm"
).PromiseUtils;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailStreams = ChromeUtils.import(
);
const { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
const EnigmailArmor = ChromeUtils.import(
);
const { EnigmailArmor } = ChromeUtils.import(
"chrome://openpgp/content/modules/armor.jsm"
).EnigmailArmor;
const EnigmailRules = ChromeUtils.import(
);
const { EnigmailRules } = ChromeUtils.import(
"chrome://openpgp/content/modules/rules.jsm"
).EnigmailRules;
const EnigmailStdlib = ChromeUtils.import(
);
const { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
var gCreatedSetupIds = [];

3
mail/extensions/openpgp/content/modules/clipboard.jsm
Просмотреть файл

@ -10,8 +10,7 @@ var EXPORTED_SYMBOLS = ["EnigmailClipboard"];
// Import the Services module for future use, if we're not in
// a browser window where it's already loaded.
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Create a constructor for the built-in transferable class
const nsTransferable = Components.Constructor(

7
mail/extensions/openpgp/content/modules/commandLine.jsm
Просмотреть файл

@ -8,11 +8,10 @@
var EXPORTED_SYMBOLS = ["EnigmailCommandLine"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const EnigmailCompat = ChromeUtils.import(
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
);
const NS_ENIGCLINE_SERVICE_CID = Components.ID(
"{847b3ab1-7ab1-11d4-8f02-006008948af5}"

16
mail/extensions/openpgp/content/modules/configBackup.jsm
Просмотреть файл

@ -6,18 +6,18 @@
var EXPORTED_SYMBOLS = ["EnigmailConfigBackup"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailRules = ChromeUtils.import(
);
const { EnigmailRules } = ChromeUtils.import(
"chrome://openpgp/content/modules/rules.jsm"
).EnigmailRules;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
);
const TYPE_BOOL = 1;
const TYPE_CHAR = 2;

51
mail/extensions/openpgp/content/modules/configure.jsm
Просмотреть файл

@ -8,45 +8,44 @@
var EXPORTED_SYMBOLS = ["EnigmailConfigure"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailTimer = ChromeUtils.import(
);
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
const EnigmailApp = ChromeUtils.import(
);
const { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
).EnigmailApp;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailWindows = ChromeUtils.import(
);
const { EnigmailWindows } = ChromeUtils.import(
"chrome://openpgp/content/modules/windows.jsm"
).EnigmailWindows;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailStdlib = ChromeUtils.import(
);
const { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
const EnigmailAutoSetup = ChromeUtils.import(
);
const { EnigmailAutoSetup } = ChromeUtils.import(
"chrome://openpgp/content/modules/autoSetup.jsm"
).EnigmailAutoSetup;
);
/**
* Upgrade sending prefs

7
mail/extensions/openpgp/content/modules/core.jsm
Просмотреть файл

@ -9,9 +9,9 @@
const { manager: Cm } = Components;
Cm.QueryInterface(Ci.nsIComponentRegistrar);
const EnigmailLazy = ChromeUtils.import(
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
// load all modules lazily to avoid possible cross-reference errors
const getEnigmailConsole = EnigmailLazy.loader(
@ -73,8 +73,7 @@ const getOpenPGPMasterpass = EnigmailLazy.loader(
"enigmail/masterpass.jsm",
"OpenPGPMasterpass"
);
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["EnigmailCore"];

15
mail/extensions/openpgp/content/modules/cryptoAPI/GnuPGCryptoAPI.jsm
Просмотреть файл

@ -8,8 +8,7 @@
var EXPORTED_SYMBOLS = ["getGnuPGAPI"];
var Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript(
"chrome://openpgp/content/modules/cryptoAPI/interface.js",
@ -17,15 +16,15 @@ Services.scriptloader.loadSubScript(
"UTF-8"
); /* global CryptoAPI */
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
);
const {
obtainKeyList,

13
mail/extensions/openpgp/content/modules/cryptoAPI/RNPCryptoAPI.jsm
Просмотреть файл

@ -8,9 +8,8 @@
var EXPORTED_SYMBOLS = ["getRNPAPI"];
const RNP = ChromeUtils.import("chrome://openpgp/content/modules/rnp.jsm").RNP;
var Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { RNP } = ChromeUtils.import("chrome://openpgp/content/modules/rnp.jsm");
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript(
"chrome://openpgp/content/modules/cryptoAPI/interface.js",
@ -18,12 +17,12 @@ Services.scriptloader.loadSubScript(
"UTF-8"
); /* global CryptoAPI */
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
);
/**
* RNP implementation of CryptoAPI

4
mail/extensions/openpgp/content/modules/cryptoAPI/gnupg-key.jsm
Просмотреть файл

@ -12,9 +12,9 @@
var EXPORTED_SYMBOLS = ["GnuPG_importKeyFromFile", "GnuPG_extractSecretKey"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
async function GnuPG_importKeyFromFile(inputFile) {
EnigmailLog.DEBUG(

20
mail/extensions/openpgp/content/modules/cryptoAPI/gnupg-keylist.jsm
Просмотреть файл

@ -17,21 +17,21 @@ var EXPORTED_SYMBOLS = [
"getGpgKeyData",
];
const EnigmailTime = ChromeUtils.import(
const { EnigmailTime } = ChromeUtils.import(
"chrome://openpgp/content/modules/time.jsm"
).EnigmailTime;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailTrust = ChromeUtils.import(
);
const { EnigmailTrust } = ChromeUtils.import(
"chrome://openpgp/content/modules/trust.jsm"
).EnigmailTrust;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
);
// field ID's of key list (as described in the doc/DETAILS file in the GnuPG distribution)
const ENTRY_ID = 0;

56
mail/extensions/openpgp/content/modules/decryption.jsm
Просмотреть файл

@ -10,48 +10,48 @@
var EXPORTED_SYMBOLS = ["EnigmailDecryption"];
const EnigmailCore = ChromeUtils.import(
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailArmor = ChromeUtils.import(
);
const { EnigmailArmor } = ChromeUtils.import(
"chrome://openpgp/content/modules/armor.jsm"
).EnigmailArmor;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailHttpProxy = ChromeUtils.import(
);
const { EnigmailHttpProxy } = ChromeUtils.import(
"chrome://openpgp/content/modules/httpProxy.jsm"
).EnigmailHttpProxy;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailKey = ChromeUtils.import(
);
const { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
).EnigmailKey;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
function statusObjectFrom(
signatureObj,

23
mail/extensions/openpgp/content/modules/dialog.jsm
Просмотреть файл

@ -8,24 +8,23 @@
var EXPORTED_SYMBOLS = ["EnigmailDialog"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLocale = ChromeUtils.import(
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailWindows = ChromeUtils.import(
);
const { EnigmailWindows } = ChromeUtils.import(
"chrome://openpgp/content/modules/windows.jsm"
).EnigmailWindows;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
);
const LOCAL_FILE_CONTRACTID = "@mozilla.org/file/local;1";

56
mail/extensions/openpgp/content/modules/encryption.jsm
Просмотреть файл

@ -8,48 +8,48 @@
var EXPORTED_SYMBOLS = ["EnigmailEncryption"];
const EnigmailCore = ChromeUtils.import(
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailApp = ChromeUtils.import(
);
const { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
).EnigmailApp;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailGpg = ChromeUtils.import(
);
const { EnigmailGpg } = ChromeUtils.import(
"chrome://openpgp/content/modules/gpg.jsm"
).EnigmailGpg;
const EnigmailErrorHandling = ChromeUtils.import(
);
const { EnigmailErrorHandling } = ChromeUtils.import(
"chrome://openpgp/content/modules/errorHandling.jsm"
).EnigmailErrorHandling;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
const gMimeHashAlgorithms = [
null,

12
mail/extensions/openpgp/content/modules/errorHandling.jsm
Просмотреть файл

@ -8,15 +8,15 @@
var EXPORTED_SYMBOLS = ["EnigmailErrorHandling"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getEnigmailKeyRing = EnigmailLazy.loader(
"enigmail/keyRing.jsm",

8
mail/extensions/openpgp/content/modules/events.jsm
Просмотреть файл

@ -8,12 +8,12 @@
var EXPORTED_SYMBOLS = ["EnigmailEvents"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailTimer = ChromeUtils.import(
);
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
);
/**** DEPRECATED - use EnigmailTimer instead *****/

16
mail/extensions/openpgp/content/modules/files.jsm
Просмотреть файл

@ -8,18 +8,18 @@
const EXPORTED_SYMBOLS = ["EnigmailFiles"];
const EnigmailData = ChromeUtils.import(
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const lazyStream = EnigmailLazy.loader(
"enigmail/streams.jsm",

53
mail/extensions/openpgp/content/modules/filters.jsm
Просмотреть файл

@ -8,45 +8,44 @@
var EXPORTED_SYMBOLS = ["EnigmailFilters"];
const EnigmailLazy = ChromeUtils.import(
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailPersistentCrypto = ChromeUtils.import(
);
const { EnigmailPersistentCrypto } = ChromeUtils.import(
"chrome://openpgp/content/modules/persistentCrypto.jsm"
).EnigmailPersistentCrypto;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailStreams = ChromeUtils.import(
);
const { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
const NetUtil = ChromeUtils.import("resource://gre/modules/NetUtil.jsm")
.NetUtil;
const EnigmailMime = ChromeUtils.import(
);
const { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailCompat = ChromeUtils.import(
);
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
);
const getDialog = EnigmailLazy.loader("enigmail/dialog.jsm", "EnigmailDialog");

23
mail/extensions/openpgp/content/modules/fixExchangeMsg.jsm
Просмотреть файл

@ -8,24 +8,23 @@
var EXPORTED_SYMBOLS = ["EnigmailFixExchangeMsg"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailStreams = ChromeUtils.import(
);
const { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
);
/*
* Fix a broken message from MS-Exchange and replace it with the original message

12
mail/extensions/openpgp/content/modules/funcs.jsm
Просмотреть файл

@ -13,15 +13,15 @@ var EXPORTED_SYMBOLS = ["EnigmailFuncs"];
*
*/
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
);
var gTxtConverter = null;

14
mail/extensions/openpgp/content/modules/glodaUtils.jsm
Просмотреть файл

@ -13,17 +13,9 @@
var EXPORTED_SYMBOLS = ["GlodaUtils"];
var GlodaUtils = null;
try {
// TB with omnijar
GlodaUtils = ChromeUtils.import("resource:///modules/gloda/GlodaUtils.jsm")
.GlodaUtils;
} catch (ex) {
// "old style" TB
GlodaUtils = ChromeUtils.import("resource://app/modules/gloda/GlodaUtils.jsm")
.GlodaUtils;
}
var { GlodaUtils } = ChromeUtils.import(
"resource:///modules/gloda/GlodaUtils.jsm"
);
// We don't define the exported symbol here - that is on purpose
// The goal of this module is simply to simplify loading of the component

8
mail/extensions/openpgp/content/modules/gpg.jsm
Просмотреть файл

@ -8,12 +8,12 @@
const EXPORTED_SYMBOLS = ["EnigmailGpg"];
const EnigmailLocale = ChromeUtils.import(
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailVersioning = ChromeUtils.import(
);
const { EnigmailVersioning } = ChromeUtils.import(
"chrome://openpgp/content/modules/versioning.jsm"
).EnigmailVersioning;
);
const MINIMUM_GPG_VERSION = "2.0.14";

28
mail/extensions/openpgp/content/modules/hash.jsm
Просмотреть файл

@ -8,27 +8,27 @@
var EXPORTED_SYMBOLS = ["EnigmailHash"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailWindows = ChromeUtils.import(
);
const { EnigmailWindows } = ChromeUtils.import(
"chrome://openpgp/content/modules/windows.jsm"
).EnigmailWindows;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailEncryption = ChromeUtils.import(
);
const { EnigmailEncryption } = ChromeUtils.import(
"chrome://openpgp/content/modules/encryption.jsm"
).EnigmailEncryption;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
);
const keyAlgorithms = [];
const mimeHashAlgorithms = [

7
mail/extensions/openpgp/content/modules/httpProxy.jsm
Просмотреть файл

@ -8,12 +8,11 @@
var EXPORTED_SYMBOLS = ["EnigmailHttpProxy"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailPrefs = ChromeUtils.import(
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
);
function getPasswdForHost(hostname, userObj, passwdObj) {
var loginmgr = Services.logins;

20
mail/extensions/openpgp/content/modules/key.jsm
Просмотреть файл

@ -8,26 +8,26 @@
var EXPORTED_SYMBOLS = ["EnigmailKey"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getKeyRing = EnigmailLazy.loader(
"enigmail/keyRing.jsm",
"EnigmailKeyRing"
);
const getDialog = EnigmailLazy.loader("enigmail/dialog.jsm", "EnigmailDialog");
const EnigmailCryptoAPI = ChromeUtils.import(
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
var EnigmailKey = {
/**

24
mail/extensions/openpgp/content/modules/keyObj.jsm
Просмотреть файл

@ -62,24 +62,24 @@ var EXPORTED_SYMBOLS = ["newEnigmailKeyObj"];
* getVirtualKeySize
*/
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailKey = ChromeUtils.import(
);
const { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
).EnigmailKey;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailTime = ChromeUtils.import(
);
const { EnigmailTime } = ChromeUtils.import(
"chrome://openpgp/content/modules/time.jsm"
).EnigmailTime;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
function newEnigmailKeyObj(keyData) {
return new EnigmailKeyObj(keyData);

27
mail/extensions/openpgp/content/modules/keyRefreshService.jsm
Просмотреть файл

@ -8,27 +8,26 @@
const EXPORTED_SYMBOLS = ["EnigmailKeyRefreshService"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailRNG = ChromeUtils.import(
);
const { EnigmailRNG } = ChromeUtils.import(
"chrome://openpgp/content/modules/rng.jsm"
).EnigmailRNG;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailKeyServer = ChromeUtils.import(
);
const { EnigmailKeyServer } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyserver.jsm"
).EnigmailKeyServer;
const EnigmailKeyserverURIs = ChromeUtils.import(
);
const { EnigmailKeyserverURIs } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyserverUris.jsm"
).EnigmailKeyserverURIs;
);
const ONE_HOUR_IN_MILLISEC = 60 * 60 * 1000;

35
mail/extensions/openpgp/content/modules/keyRing.jsm
Просмотреть файл

@ -8,32 +8,31 @@
var EXPORTED_SYMBOLS = ["EnigmailKeyRing"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailTrust = ChromeUtils.import(
);
const { EnigmailTrust } = ChromeUtils.import(
"chrome://openpgp/content/modules/trust.jsm"
).EnigmailTrust;
const EnigmailArmor = ChromeUtils.import(
);
const { EnigmailArmor } = ChromeUtils.import(
"chrome://openpgp/content/modules/armor.jsm"
).EnigmailArmor;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
const newEnigmailKeyObj = ChromeUtils.import(
);
const { newEnigmailKeyObj } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyObj.jsm"
).newEnigmailKeyObj;
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
const getDialog = EnigmailLazy.loader("enigmail/dialog.jsm", "EnigmailDialog");
const getWindows = EnigmailLazy.loader(

24
mail/extensions/openpgp/content/modules/keyUsability.jsm
Просмотреть файл

@ -8,24 +8,24 @@
var EXPORTED_SYMBOLS = ["EnigmailKeyUsability"];
const EnigmailLocale = ChromeUtils.import(
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getDialog = EnigmailLazy.loader("enigmail/dialog.jsm", "EnigmailDialog");
const getWindows = EnigmailLazy.loader(

44
mail/extensions/openpgp/content/modules/keyserver.jsm
Просмотреть файл

@ -8,39 +8,39 @@
const EXPORTED_SYMBOLS = ["EnigmailKeyServer"];
const EnigmailPrefs = ChromeUtils.import(
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailKeyserverURIs = ChromeUtils.import(
);
const { EnigmailKeyserverURIs } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyserverUris.jsm"
).EnigmailKeyserverURIs;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailGpg = ChromeUtils.import(
);
const { EnigmailGpg } = ChromeUtils.import(
"chrome://openpgp/content/modules/gpg.jsm"
).EnigmailGpg;
const EnigmailXhrUtils = ChromeUtils.import(
);
const { EnigmailXhrUtils } = ChromeUtils.import(
"chrome://openpgp/content/modules/xhrUtils.jsm"
).EnigmailXhrUtils;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
const ENIG_DEFAULT_HKP_PORT = "11371";
const ENIG_DEFAULT_HKPS_PORT = "443";

4
mail/extensions/openpgp/content/modules/keyserverUris.jsm
Просмотреть файл

@ -8,9 +8,9 @@
const EXPORTED_SYMBOLS = ["EnigmailKeyserverURIs"];
const EnigmailPrefs = ChromeUtils.import(
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
);
const KEYSERVER_PREF = "keyserver";
const AUTO_KEYSERVER_SELECTION_PREF = "autoKeyServerSelection";

7
mail/extensions/openpgp/content/modules/locale.jsm
Просмотреть файл

@ -8,12 +8,11 @@
var EXPORTED_SYMBOLS = ["EnigmailLocale"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
var gEnigStringBundle = null;

16
mail/extensions/openpgp/content/modules/log.jsm
Просмотреть файл

@ -10,17 +10,17 @@
var EXPORTED_SYMBOLS = ["EnigmailLog"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailConsole = ChromeUtils.import(
const { EnigmailConsole } = ChromeUtils.import(
"chrome://openpgp/content/modules/pipeConsole.jsm"
).EnigmailConsole;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
);
const { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
const MAX_LOG_LEN = 2500;

7
mail/extensions/openpgp/content/modules/masterpass.jsm
Просмотреть файл

@ -12,12 +12,11 @@ var EXPORTED_SYMBOLS = ["OpenPGPMasterpass"];
Cu.importGlobalProperties(["crypto"]);
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
const PASS_URI = "chrome://openpgp-secret-key-password";
const PASS_REALM = "DO NOT DELETE";

14
mail/extensions/openpgp/content/modules/mime.jsm
Просмотреть файл

@ -8,16 +8,16 @@
var EXPORTED_SYMBOLS = ["EnigmailMime"];
const jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
const EnigmailData = ChromeUtils.import(
const { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailRNG = ChromeUtils.import(
);
const { EnigmailRNG } = ChromeUtils.import(
"chrome://openpgp/content/modules/rng.jsm"
).EnigmailRNG;
const EnigmailStreams = ChromeUtils.import(
);
const { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
);
var EnigmailMime = {
/***

60
mail/extensions/openpgp/content/modules/mimeDecrypt.jsm
Просмотреть файл

@ -11,51 +11,51 @@ var EXPORTED_SYMBOLS = ["EnigmailMimeDecrypt"];
* implemented as an XPCOM object
*/
const EnigmailCore = ChromeUtils.import(
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailVerify = ChromeUtils.import(
);
const { EnigmailVerify } = ChromeUtils.import(
"chrome://openpgp/content/modules/mimeVerify.jsm"
).EnigmailVerify;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailDecryption = ChromeUtils.import(
);
const { EnigmailDecryption } = ChromeUtils.import(
"chrome://openpgp/content/modules/decryption.jsm"
).EnigmailDecryption;
var EnigmailMime = ChromeUtils.import(
);
var { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailURIs = ChromeUtils.import(
);
const { EnigmailURIs } = ChromeUtils.import(
"chrome://openpgp/content/modules/uris.jsm"
).EnigmailURIs;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailSingletons = ChromeUtils.import(
);
const { EnigmailSingletons } = ChromeUtils.import(
"chrome://openpgp/content/modules/singletons.jsm"
).EnigmailSingletons;
const EnigmailHttpProxy = ChromeUtils.import(
);
const { EnigmailHttpProxy } = ChromeUtils.import(
"chrome://openpgp/content/modules/httpProxy.jsm"
).EnigmailHttpProxy;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
const EnigmailAutocrypt = ChromeUtils.import(
);
const { EnigmailAutocrypt } = ChromeUtils.import(
"chrome://openpgp/content/modules/autocrypt.jsm"
).EnigmailAutocrypt;
const EnigmailCompat = ChromeUtils.import(
);
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
);
const ENCODING_DEFAULT = 0;
const ENCODING_BASE64 = 1;

45
mail/extensions/openpgp/content/modules/mimeEncrypt.jsm
Просмотреть файл

@ -11,40 +11,39 @@
var EXPORTED_SYMBOLS = ["EnigmailMimeEncrypt"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
const EnigmailCompat = ChromeUtils.import(
const { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailEncryption = ChromeUtils.import(
);
const { EnigmailEncryption } = ChromeUtils.import(
"chrome://openpgp/content/modules/encryption.jsm"
).EnigmailEncryption;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailHash = ChromeUtils.import(
);
const { EnigmailHash } = ChromeUtils.import(
"chrome://openpgp/content/modules/hash.jsm"
).EnigmailHash;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
);
// our own contract IDs
const PGPMIME_ENCRYPT_CID = Components.ID(

53
mail/extensions/openpgp/content/modules/mimeVerify.jsm
Просмотреть файл

@ -6,50 +6,49 @@
var EXPORTED_SYMBOLS = ["EnigmailVerify"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
/**
* Module for handling PGP/MIME signed messages
* implemented as JS module
*/
const EnigmailCompat = ChromeUtils.import(
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailPrefs = ChromeUtils.import(
);
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailDecryption = ChromeUtils.import(
);
const { EnigmailDecryption } = ChromeUtils.import(
"chrome://openpgp/content/modules/decryption.jsm"
).EnigmailDecryption;
const EnigmailSingletons = ChromeUtils.import(
);
const { EnigmailSingletons } = ChromeUtils.import(
"chrome://openpgp/content/modules/singletons.jsm"
).EnigmailSingletons;
const EnigmailHttpProxy = ChromeUtils.import(
);
const { EnigmailHttpProxy } = ChromeUtils.import(
"chrome://openpgp/content/modules/httpProxy.jsm"
).EnigmailHttpProxy;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
const PGPMIME_PROTO = "application/pgp-signature";

16
mail/extensions/openpgp/content/modules/msgRead.jsm
Просмотреть файл

@ -12,18 +12,18 @@ var EXPORTED_SYMBOLS = ["EnigmailMsgRead"];
* Message-reading related functions
*/
const EnigmailPrefs = ChromeUtils.import(
const { EnigmailPrefs } = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailCompat = ChromeUtils.import(
);
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
);
const ExtraHeaders = ["autocrypt", "openpgp"];

3
mail/extensions/openpgp/content/modules/os.jsm
Просмотреть файл

@ -8,8 +8,7 @@
const EXPORTED_SYMBOLS = ["EnigmailOS"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
let operatingSystem = null;

57
mail/extensions/openpgp/content/modules/persistentCrypto.jsm
Просмотреть файл

@ -6,51 +6,50 @@
"use strict";
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["EnigmailPersistentCrypto"];
const EnigmailLazy = ChromeUtils.import(
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailArmor = ChromeUtils.import(
);
const { EnigmailArmor } = ChromeUtils.import(
"chrome://openpgp/content/modules/armor.jsm"
).EnigmailArmor;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const GlodaUtils = ChromeUtils.import(
);
const { GlodaUtils } = ChromeUtils.import(
"chrome://openpgp/content/modules/glodaUtils.jsm"
).GlodaUtils;
const EnigmailCompat = ChromeUtils.import(
);
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailTimer = ChromeUtils.import(
);
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
const EnigmailStdlib = ChromeUtils.import(
);
const { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
const { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
const EnigmailEncryption = ChromeUtils.import(
);
const { EnigmailEncryption } = ChromeUtils.import(
"chrome://openpgp/content/modules/encryption.jsm"
).EnigmailEncryption;
);
const getFixExchangeMsg = EnigmailLazy.loader(
"enigmail/fixExchangeMsg.jsm",

35
mail/extensions/openpgp/content/modules/pgpmimeHandler.jsm
Просмотреть файл

@ -12,35 +12,34 @@
const { manager: Cm } = Components;
Cm.QueryInterface(Ci.nsIComponentRegistrar);
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var EXPORTED_SYMBOLS = ["EnigmailPgpmimeHander"];
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailMimeDecrypt = ChromeUtils.import(
);
const { EnigmailMimeDecrypt } = ChromeUtils.import(
"chrome://openpgp/content/modules/mimeDecrypt.jsm"
).EnigmailMimeDecrypt;
const EnigmailVerify = ChromeUtils.import(
);
const { EnigmailVerify } = ChromeUtils.import(
"chrome://openpgp/content/modules/mimeVerify.jsm"
).EnigmailVerify;
const EnigmailWksMimeHandler = ChromeUtils.import(
);
const { EnigmailWksMimeHandler } = ChromeUtils.import(
"chrome://openpgp/content/modules/wksMimeHandler.jsm"
).EnigmailWksMimeHandler;
const EnigmailMime = ChromeUtils.import(
);
const { EnigmailMime } = ChromeUtils.import(
"chrome://openpgp/content/modules/mime.jsm"
).EnigmailMime;
const EnigmailSingletons = ChromeUtils.import(
);
const { EnigmailSingletons } = ChromeUtils.import(
"chrome://openpgp/content/modules/singletons.jsm"
).EnigmailSingletons;
);
const PGPMIME_JS_DECRYPTOR_CONTRACTID =
"@mozilla.org/mime/pgp-mime-js-decrypt;1";

4
mail/extensions/openpgp/content/modules/prefs.jsm
Просмотреть файл

@ -8,9 +8,9 @@
var EXPORTED_SYMBOLS = ["EnigmailPrefs"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const ENIGMAIL_PREFS_ROOT = "temp.openpgp.";

30
mail/extensions/openpgp/content/modules/protocolHandler.jsm
Просмотреть файл

@ -8,29 +8,27 @@
var EXPORTED_SYMBOLS = ["EnigmailProtocolHandler"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailStreams = ChromeUtils.import(
);
const { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
const EnigmailURIs = ChromeUtils.import(
);
const { EnigmailURIs } = ChromeUtils.import(
"chrome://openpgp/content/modules/uris.jsm"
).EnigmailURIs;
const NetUtil = ChromeUtils.import("resource://gre/modules/NetUtil.jsm")
.NetUtil;
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const NS_ENIGMAILPROTOCOLHANDLER_CONTRACTID =
"@mozilla.org/network/protocol;1?name=enigmail";

8
mail/extensions/openpgp/content/modules/rnpLib.jsm
Просмотреть файл

@ -7,12 +7,12 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var systemOS = Services.appinfo.OS.toLowerCase();
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
var abi = ctypes.default_abi;
const EnigmailApp = ChromeUtils.import(
const { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
).EnigmailApp;
var OpenPGPMasterpass = ChromeUtils.import(
);
var { OpenPGPMasterpass } = ChromeUtils.import(
"chrome://openpgp/content/modules/masterpass.jsm"
).OpenPGPMasterpass;
);
// Open librnp. Determine the path to the chrome directory and look for it
// there first. If not, fallback to searching the standard locations.

41
mail/extensions/openpgp/content/modules/rules.jsm
Просмотреть файл

@ -9,32 +9,33 @@
var EXPORTED_SYMBOLS = ["EnigmailRules"];
/*EnigmailFuncs: false, : false, : false, : false, : false */
const EnigmailFuncs = ChromeUtils.import(
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailApp = ChromeUtils.import(
);
const { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
).EnigmailApp;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
const EnigmailDialog = ChromeUtils.import(
);
const { EnigmailDialog } = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getKeyRing = EnigmailLazy.loader(
"enigmail/keyRing.jsm",
@ -740,9 +741,9 @@ var EnigmailRules = {
};
async function deleteAutocryptRule(emailAddr) {
const EnigmailAutocrypt = ChromeUtils.import(
const { EnigmailAutocrypt } = ChromeUtils.import(
"chrome://openpgp/content/modules/autocrypt.jsm"
).EnigmailAutocrypt;
);
await EnigmailAutocrypt.deleteUser(emailAddr, "1");
// make sure that gossip rule is marked as "imported"

4
mail/extensions/openpgp/content/modules/searchCallback.jsm
Просмотреть файл

@ -8,9 +8,9 @@
const EXPORTED_SYMBOLS = ["EnigmailSearchCallback"];
const EnigmailTimer = ChromeUtils.import(
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
);
var EnigmailSearchCallback = {
/**

23
mail/extensions/openpgp/content/modules/send.jsm
Просмотреть файл

@ -8,23 +8,22 @@
var EXPORTED_SYMBOLS = ["EnigmailSend"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailStdlib = ChromeUtils.import(
);
const { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const EnigmailRNG = ChromeUtils.import(
);
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EnigmailRNG } = ChromeUtils.import(
"chrome://openpgp/content/modules/rng.jsm"
).EnigmailRNG;
);
var EnigmailSend = {
/**

15
mail/extensions/openpgp/content/modules/socks5Proxy.jsm
Просмотреть файл

@ -8,20 +8,19 @@
const EXPORTED_SYMBOLS = ["EnigmailSocks5Proxy"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const CC = Components.Constructor;
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLazy = ChromeUtils.import(
);
const { EnigmailLazy } = ChromeUtils.import(
"chrome://openpgp/content/modules/lazy.jsm"
).EnigmailLazy;
);
const getEnigmailPrefs = EnigmailLazy.loader(
"enigmail/prefs.jsm",
"EnigmailPrefs"

14
mail/extensions/openpgp/content/modules/sqliteDb.jsm
Просмотреть файл

@ -10,13 +10,13 @@
var EXPORTED_SYMBOLS = ["EnigmailSqliteDb"];
const Sqlite = ChromeUtils.import("resource://gre/modules/Sqlite.jsm").Sqlite;
const EnigmailTimer = ChromeUtils.import(
const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
var EnigmailSqliteDb = {
/**
@ -117,9 +117,9 @@ async function checkAutocryptTable(connection) {
{},
function(row) {}
);
let EnigmailAutocrypt = ChromeUtils.import(
let { EnigmailAutocrypt } = ChromeUtils.import(
"chrome://openpgp/content/modules/autocrypt.jsm"
).EnigmailAutocrypt;
);
EnigmailAutocrypt.updateAllImportedKeys();
}
} catch (error) {

18
mail/extensions/openpgp/content/modules/stdlib/compose.jsm
Просмотреть файл

@ -22,17 +22,11 @@ var EXPORTED_SYMBOLS = [
"getSignatureContentsForAccount",
];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var MailServices;
try {
MailServices = ChromeUtils.import("resource:///modules/MailServices.jsm")
.MailServices;
} catch (x) {
MailServices = ChromeUtils.import("resource:///modules/mailServices.js")
.MailServices;
}
var { MailServices } = ChromeUtils.import(
"resource:///modules/MailServices.jsm"
);
const {
getIdentities,
@ -45,9 +39,9 @@ const {
const { msgHdrGetUri, getMail3Pane, msgHdrGetHeaders } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib/msgHdrUtils.jsm"
);
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
);
function getEditorForIframe(aIframe) {
let w = aIframe.contentWindow;

25
mail/extensions/openpgp/content/modules/stdlib/misc.jsm
Просмотреть файл

@ -41,21 +41,18 @@ var EXPORTED_SYMBOLS = [
"isAccel",
];
const fixIterator = ChromeUtils.import("resource:///modules/iteratorUtils.jsm")
.fixIterator;
const XPCOMUtils = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm")
.XPCOMUtils;
const EnigmailLog = ChromeUtils.import(
const { fixIterator } = ChromeUtils.import(
"resource:///modules/iteratorUtils.jsm"
);
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
var MailServices;
try {
MailServices = ChromeUtils.import("resource:///modules/MailServices.jsm")
.MailServices;
} catch (x) {
MailServices = ChromeUtils.import("resource:///modules/mailServices.js")
.MailServices;
}
);
var { MailServices } = ChromeUtils.import(
"resource:///modules/MailServices.jsm"
);
XPCOMUtils.defineLazyServiceGetter(
MailServices,

23
mail/extensions/openpgp/content/modules/stdlib/msgHdrUtils.jsm
Просмотреть файл

@ -46,28 +46,23 @@ const nsMsgFolderFlags_Inbox = 0x00001000;
const PR_WRONLY = 0x02;
const XPCOMUtils = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm")
.XPCOMUtils;
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
const { MsgHdrToMimeMessage, MimeMessage } = ChromeUtils.import(
"resource:///modules/gloda/MimeMessage.jsm"
);
const { toXPCOMArray } = ChromeUtils.import(
"resource:///modules/iteratorUtils.jsm"
);
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const EnigmailCompat = ChromeUtils.import(
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
);
var MailServices;
try {
MailServices = ChromeUtils.import("resource:///modules/MailServices.jsm")
.MailServices;
} catch (x) {
MailServices = ChromeUtils.import("resource:///modules/mailServices.js")
.MailServices;
}
var { MailServices } = ChromeUtils.import(
"resource:///modules/MailServices.jsm"
);
const { entries, NS_SUCCEEDED } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib/misc.jsm"

18
mail/extensions/openpgp/content/modules/streams.jsm
Просмотреть файл

@ -8,19 +8,17 @@
var EXPORTED_SYMBOLS = ["EnigmailStreams"];
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailTimer = ChromeUtils.import(
);
const { EnigmailTimer } = ChromeUtils.import(
"chrome://openpgp/content/modules/timer.jsm"
).EnigmailTimer;
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const NetUtil = ChromeUtils.import("resource://gre/modules/NetUtil.jsm")
.NetUtil;
);
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const NS_STRING_INPUT_STREAM_CONTRACTID =
"@mozilla.org/io/string-input-stream;1";

4
mail/extensions/openpgp/content/modules/time.jsm
Просмотреть файл

@ -8,9 +8,9 @@
var EXPORTED_SYMBOLS = ["EnigmailTime"];
const EnigmailLocale = ChromeUtils.import(
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
);
const DATE_2DIGIT = "2-digit";
const DATE_4DIGIT = "numeric";

4
mail/extensions/openpgp/content/modules/trust.jsm
Просмотреть файл

@ -8,9 +8,9 @@
var EXPORTED_SYMBOLS = ["EnigmailTrust"];
const EnigmailLocale = ChromeUtils.import(
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
);
// trust flags according to GPG documentation:
// - https://www.gnupg.org/documentation/manuals/gnupg.pdf

8
mail/extensions/openpgp/content/modules/uris.jsm
Просмотреть файл

@ -8,12 +8,12 @@
var EXPORTED_SYMBOLS = ["EnigmailURIs"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
);
const messageIdList = {};
const encryptedUris = [];

12
mail/extensions/openpgp/content/modules/verify.jsm
Просмотреть файл

@ -8,15 +8,15 @@
var EXPORTED_SYMBOLS = ["EnigmailVerifyAttachment"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailFiles = ChromeUtils.import(
);
const { EnigmailFiles } = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
var EnigmailVerifyAttachment = {
attachment(verifyFile, sigFile) {

3
mail/extensions/openpgp/content/modules/versioning.jsm
Просмотреть файл

@ -8,8 +8,7 @@
const EXPORTED_SYMBOLS = ["EnigmailVersioning"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
function greaterThanOrEqual(versionWeHave, versionWeAreComparingWith) {
return Services.vc.compare(versionWeHave, versionWeAreComparingWith) >= 0;

12
mail/extensions/openpgp/content/modules/webKey.jsm
Просмотреть файл

@ -14,15 +14,15 @@
var EXPORTED_SYMBOLS = ["EnigmailWks"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailStdlib = ChromeUtils.import(
);
const { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
const EnigmailFuncs = ChromeUtils.import(
);
const { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
);
var EnigmailWks = {
wksClientPath: null,

27
mail/extensions/openpgp/content/modules/windows.jsm
Просмотреть файл

@ -8,27 +8,26 @@
const EXPORTED_SYMBOLS = ["EnigmailWindows"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailCore = ChromeUtils.import(
);
const { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailKeyRing = ChromeUtils.import(
);
const { EnigmailKeyRing } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;
const EnigmailRules = ChromeUtils.import(
);
const { EnigmailRules } = ChromeUtils.import(
"chrome://openpgp/content/modules/rules.jsm"
).EnigmailRules;
const EnigmailStdlib = ChromeUtils.import(
);
const { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
);
var EnigmailWindows = {
/**

16
mail/extensions/openpgp/content/modules/wkdLookup.jsm
Просмотреть файл

@ -11,18 +11,18 @@
var EXPORTED_SYMBOLS = ["EnigmailWkdLookup"];
const EnigmailLog = ChromeUtils.import(
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailZBase32 = ChromeUtils.import(
);
const { EnigmailZBase32 } = ChromeUtils.import(
"chrome://openpgp/content/modules/zbase32.jsm"
).EnigmailZBase32;
const EnigmailData = ChromeUtils.import(
);
const { EnigmailData } = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
const EnigmailSqliteDb = ChromeUtils.import(
);
const { EnigmailSqliteDb } = ChromeUtils.import(
"chrome://openpgp/content/modules/sqliteDb.jsm"
).EnigmailSqliteDb;
);
Cu.importGlobalProperties(["fetch"]);

31
mail/extensions/openpgp/content/modules/wksMimeHandler.jsm
Просмотреть файл

@ -6,34 +6,33 @@
var EXPORTED_SYMBOLS = ["EnigmailWksMimeHandler"];
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* Module for handling response messages from OpenPGP Web Key Service
*/
const EnigmailCompat = ChromeUtils.import(
const { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailVerify = ChromeUtils.import(
);
const { EnigmailVerify } = ChromeUtils.import(
"chrome://openpgp/content/modules/mimeVerify.jsm"
).EnigmailVerify;
const EnigmailLog = ChromeUtils.import(
);
const { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
).EnigmailLog;
const EnigmailLocale = ChromeUtils.import(
);
const { EnigmailLocale } = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
const EnigmailDecryption = ChromeUtils.import(
);
const { EnigmailDecryption } = ChromeUtils.import(
"chrome://openpgp/content/modules/decryption.jsm"
).EnigmailDecryption;
const EnigmailSingletons = ChromeUtils.import(
);
const { EnigmailSingletons } = ChromeUtils.import(
"chrome://openpgp/content/modules/singletons.jsm"
).EnigmailSingletons;
const EnigmailConstants = ChromeUtils.import(
);
const { EnigmailConstants } = ChromeUtils.import(
"chrome://openpgp/content/modules/constants.jsm"
).EnigmailConstants;
);
var gDebugLog = false;

5
mail/extensions/openpgp/content/ui/am-enigprefs.js
Просмотреть файл

@ -6,8 +6,9 @@
"use strict";
var EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm")
.EnigmailLog;
var { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
);
var EnigmailCore = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;

5
mail/extensions/openpgp/content/ui/commonWorkflows.js
Просмотреть файл

@ -12,8 +12,9 @@ var EnigmailDialog = ChromeUtils.import(
var EnigmailLocale = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
var EnigmailKey = ChromeUtils.import("chrome://openpgp/content/modules/key.jsm")
.EnigmailKey;
var { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
);
var EnigmailKeyRing = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;

30
mail/extensions/openpgp/content/ui/enigmailCommon.js
Просмотреть файл

@ -10,8 +10,7 @@
"use strict";
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// enigmailCommon.js: shared JS functions for Enigmail
@ -24,15 +23,18 @@ var EnigmailCore = ChromeUtils.import(
var EnigmailFuncs = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
var EnigmailKey = ChromeUtils.import("chrome://openpgp/content/modules/key.jsm")
.EnigmailKey;
var EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm")
.EnigmailLog;
var { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
);
var { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
);
var EnigmailPrefs = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
var EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
var { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
var EnigmailLocale = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
@ -42,8 +44,9 @@ var EnigmailData = ChromeUtils.import(
var EnigmailFiles = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
var EnigmailApp = ChromeUtils.import("chrome://openpgp/content/modules/app.jsm")
.EnigmailApp;
var { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
);
var EnigmailDialog = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
@ -74,8 +77,9 @@ var EnigmailKeyServer = ChromeUtils.import(
var EnigmailEvents = ChromeUtils.import(
"chrome://openpgp/content/modules/events.jsm"
).EnigmailEvents;
var EnigmailGpg = ChromeUtils.import("chrome://openpgp/content/modules/gpg.jsm")
.EnigmailGpg;
var { EnigmailGpg } = ChromeUtils.import(
"chrome://openpgp/content/modules/gpg.jsm"
);
var EnigmailStreams = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
@ -86,7 +90,7 @@ var EnigmailCryptoAPI = ChromeUtils.import(
var OpenPGPMasterpass = ChromeUtils.import(
"chrome://openpgp/content/modules/masterpass.jsm"
).OpenPGPMasterpass;
var RNP = ChromeUtils.import("chrome://openpgp/content/modules/rnp.jsm").RNP;
var { RNP } = ChromeUtils.import("chrome://openpgp/content/modules/rnp.jsm");
// The compatible Enigmime version
var gEnigmailSvc;

5
mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.js
Просмотреть файл

@ -22,8 +22,9 @@ var EnigmailEvents = ChromeUtils.import(
var EnigmailData = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
var EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
var { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
function onLoad() {
var dlg = document.getElementById("enigmailKeyImportInfo");

47
mail/extensions/openpgp/content/ui/enigmailKeyManager.js
Просмотреть файл

@ -19,45 +19,44 @@
/* global EnigmailLog: false, EnigmailEvents: false, EnigmailKeyRing: false, EnigmailKeyEditor: false */
/* global EnigmailKey: false, EnigmailLocale: false, EnigmailPrefs: false, EnigmailConstants: false */
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
// Initialize enigmailCommon
EnigInitCommon("enigmailKeyManager");
var EnigmailCore = ChromeUtils.import(
var { EnigmailCore } = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
var EnigmailStreams = ChromeUtils.import(
);
var { EnigmailStreams } = ChromeUtils.import(
"chrome://openpgp/content/modules/streams.jsm"
).EnigmailStreams;
var EnigmailClipboard = ChromeUtils.import(
);
var { EnigmailClipboard } = ChromeUtils.import(
"chrome://openpgp/content/modules/clipboard.jsm"
).EnigmailClipboard;
var EnigmailFuncs = ChromeUtils.import(
);
var { EnigmailFuncs } = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
var EnigmailStdlib = ChromeUtils.import(
);
var { EnigmailStdlib } = ChromeUtils.import(
"chrome://openpgp/content/modules/stdlib.jsm"
).EnigmailStdlib;
var EnigmailWindows = ChromeUtils.import(
);
var { EnigmailWindows } = ChromeUtils.import(
"chrome://openpgp/content/modules/windows.jsm"
).EnigmailWindows;
var EnigmailKeyServer = ChromeUtils.import(
);
var { EnigmailKeyServer } = ChromeUtils.import(
"chrome://openpgp/content/modules/keyserver.jsm"
).EnigmailKeyServer;
var EnigmailWks = ChromeUtils.import(
);
var { EnigmailWks } = ChromeUtils.import(
"chrome://openpgp/content/modules/webKey.jsm"
).EnigmailWks;
var EnigmailSearchCallback = ChromeUtils.import(
);
var { EnigmailSearchCallback } = ChromeUtils.import(
"chrome://openpgp/content/modules/searchCallback.jsm"
).EnigmailSearchCallback;
var EnigmailCompat = ChromeUtils.import(
);
var { EnigmailCompat } = ChromeUtils.import(
"chrome://openpgp/content/modules/compat.jsm"
).EnigmailCompat;
const EnigmailCryptoAPI = ChromeUtils.import(
);
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
).EnigmailCryptoAPI;
);
const INPUT = 0;
const RESULT = 1;

5
mail/extensions/openpgp/content/ui/enigmailKeySelection.js
Просмотреть файл

@ -17,8 +17,9 @@ EnigInitCommon("enigmailKeySelection");
var EnigmailFuncs = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
var EnigmailKey = ChromeUtils.import("chrome://openpgp/content/modules/key.jsm")
.EnigmailKey;
var { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
);
var EnigmailSearchCallback = ChromeUtils.import(
"chrome://openpgp/content/modules/searchCallback.jsm"
).EnigmailSearchCallback;

23
mail/extensions/openpgp/content/ui/enigmailMessengerOverlay.js
Просмотреть файл

@ -36,26 +36,30 @@ var EnigmailVerifyAttachment = ChromeUtils.import(
var EnigmailFixExchangeMsg = ChromeUtils.import(
"chrome://openpgp/content/modules/fixExchangeMsg.jsm"
).EnigmailFixExchangeMsg;
var EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm")
.EnigmailLog;
var { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
);
var EnigmailPrefs = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
var EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
var { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
var EnigmailLocale = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;
var EnigmailFiles = ChromeUtils.import(
"chrome://openpgp/content/modules/files.jsm"
).EnigmailFiles;
var EnigmailKey = ChromeUtils.import("chrome://openpgp/content/modules/key.jsm")
.EnigmailKey;
var { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
);
var EnigmailData = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
var EnigmailApp = ChromeUtils.import("chrome://openpgp/content/modules/app.jsm")
.EnigmailApp;
var { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
);
var EnigmailDialog = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
@ -116,8 +120,7 @@ var EnigmailStdlib = ChromeUtils.import(
var EnigmailConfigure = ChromeUtils.import(
"chrome://openpgp/content/modules/configure.jsm"
).EnigmailConfigure;
var Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var Enigmail;
if (!Enigmail) {

5
mail/extensions/openpgp/content/ui/enigmailMsgBox.js
Просмотреть файл

@ -9,8 +9,9 @@
var EnigmailClipboard = ChromeUtils.import(
"chrome://openpgp/content/modules/clipboard.jsm"
).EnigmailClipboard;
var EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
var { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
var EnigmailLocale = ChromeUtils.import(
"chrome://openpgp/content/modules/locale.jsm"
).EnigmailLocale;

10
mail/extensions/openpgp/content/ui/enigmailMsgComposeHelper.js
Просмотреть файл

@ -16,8 +16,9 @@ var EnigmailCore = ChromeUtils.import(
var EnigmailFuncs = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
var EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm")
.EnigmailLog;
var { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
);
var EnigmailPrefs = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
@ -27,8 +28,9 @@ var EnigmailLocale = ChromeUtils.import(
var EnigmailDialog = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
var EnigmailGpg = ChromeUtils.import("chrome://openpgp/content/modules/gpg.jsm")
.EnigmailGpg;
var { EnigmailGpg } = ChromeUtils.import(
"chrome://openpgp/content/modules/gpg.jsm"
);
var EnigmailTrust = ChromeUtils.import(
"chrome://openpgp/content/modules/trust.jsm"
).EnigmailTrust;

20
mail/extensions/openpgp/content/ui/enigmailMsgComposeOverlay.js
Просмотреть файл

@ -16,22 +16,21 @@
/*global gSendEncrypted: true, gOptionalEncryption: true, gSendSigned: true, gSelectedTechnologyIsPGP: true */
/*global gIsRelatedToEncryptedOriginal: true, gIsRelatedToSignedOriginal: true, gAttachMyPublicPGPKey: true */
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
var EnigmailCore = ChromeUtils.import(
"chrome://openpgp/content/modules/core.jsm"
).EnigmailCore;
var EnigmailFuncs = ChromeUtils.import(
"chrome://openpgp/content/modules/funcs.jsm"
).EnigmailFuncs;
var EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm")
.EnigmailLog;
var { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
);
var EnigmailPrefs = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
var EnigmailOS = ChromeUtils.import("chrome://openpgp/content/modules/os.jsm")
.EnigmailOS;
var { EnigmailOS } = ChromeUtils.import(
"chrome://openpgp/content/modules/os.jsm"
);
var EnigmailArmor = ChromeUtils.import(
"chrome://openpgp/content/modules/armor.jsm"
).EnigmailArmor;
@ -44,8 +43,9 @@ var EnigmailFiles = ChromeUtils.import(
var EnigmailData = ChromeUtils.import(
"chrome://openpgp/content/modules/data.jsm"
).EnigmailData;
var EnigmailApp = ChromeUtils.import("chrome://openpgp/content/modules/app.jsm")
.EnigmailApp;
var { EnigmailApp } = ChromeUtils.import(
"chrome://openpgp/content/modules/app.jsm"
);
var EnigmailDialog = ChromeUtils.import(
"chrome://openpgp/content/modules/dialog.jsm"
).EnigmailDialog;
@ -88,7 +88,7 @@ var EnigmailMsgRead = ChromeUtils.import(
var EnigmailMimeEncrypt = ChromeUtils.import(
"chrome://openpgp/content/modules/mimeEncrypt.jsm"
).EnigmailMimeEncrypt;
var jsmime = ChromeUtils.import("resource:///modules/jsmime.jsm").jsmime;
var { jsmime } = ChromeUtils.import("resource:///modules/jsmime.jsm");
// Account encryption policy values:
// const kEncryptionPolicy_Never = 0;

15
mail/extensions/openpgp/content/ui/enigmailMsgHdrViewOverlay.js
Просмотреть файл

@ -21,8 +21,9 @@ var EnigmailFuncs = ChromeUtils.import(
var EnigmailVerify = ChromeUtils.import(
"chrome://openpgp/content/modules/mimeVerify.jsm"
).EnigmailVerify;
var EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm")
.EnigmailLog;
var { EnigmailLog } = ChromeUtils.import(
"chrome://openpgp/content/modules/log.jsm"
);
var EnigmailPrefs = ChromeUtils.import(
"chrome://openpgp/content/modules/prefs.jsm"
).EnigmailPrefs;
@ -38,10 +39,12 @@ var EnigmailDialog = ChromeUtils.import(
var EnigmailTime = ChromeUtils.import(
"chrome://openpgp/content/modules/time.jsm"
).EnigmailTime;
var EnigmailGpg = ChromeUtils.import("chrome://openpgp/content/modules/gpg.jsm")
.EnigmailGpg;
var EnigmailKey = ChromeUtils.import("chrome://openpgp/content/modules/key.jsm")
.EnigmailKey;
var { EnigmailGpg } = ChromeUtils.import(
"chrome://openpgp/content/modules/gpg.jsm"
);
var { EnigmailKey } = ChromeUtils.import(
"chrome://openpgp/content/modules/key.jsm"
);
var EnigmailKeyRing = ChromeUtils.import(
"chrome://openpgp/content/modules/keyRing.jsm"
).EnigmailKeyRing;

3
mail/extensions/openpgp/content/ui/keyDetailsDlg.js
Просмотреть файл

@ -17,8 +17,7 @@
"use strict";
const Services = ChromeUtils.import("resource://gre/modules/Services.jsm")
.Services;
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var gKeyId = null;
var gUserId = null;