Bug 1677088 - remove EnigmailCommandLine. r=PatrickBrunschwig

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

--HG--
extra : rebase_source : 490944563f3be59e637e501930f7226eb0315db1
This commit is contained in:
Magnus Melin 2021-10-11 09:38:11 +03:00
Родитель 819075427f
Коммит 10912f6511
2 изменённых файлов: 0 добавлений и 65 удалений

Просмотреть файл

@ -1,55 +0,0 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
"use strict";
var EXPORTED_SYMBOLS = ["EnigmailCommandLine"];
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const NS_ENIGCLINE_SERVICE_CID = Components.ID(
"{847b3ab1-7ab1-11d4-8f02-006008948af5}"
);
const NS_CLINE_SERVICE_CONTRACTID = "@mozilla.org/enigmail/cline-handler;1";
function Handler() {}
Handler.prototype = {
classDescription: "OpenPGP Key Manager CommandLine Service",
classID: NS_ENIGCLINE_SERVICE_CID,
contractID: NS_CLINE_SERVICE_CONTRACTID,
QueryInterface: ChromeUtils.generateQI([
"nsICommandLineHandler",
"nsIFactory",
]),
// nsICommandLineHandler
handle(cmdLine) {
if (cmdLine.handleFlag("pgpkeyman", false)) {
cmdLine.preventDefault = true; // do not open main app window
Services.ww.openWindow(
null,
"chrome://openpgp/content/ui/enigmailKeyManager.xhtml",
"_blank",
"chrome,dialog=no,all",
cmdLine
);
}
},
helpInfo: " -pgpkeyman Open the OpenPGP key manager.\n",
lockFactory(lock) {},
};
var EnigmailCommandLine = {
Handler,
categoryRegistry: {
category: "command-line-handler",
entry: "m-cline-enigmail",
serviceName: NS_CLINE_SERVICE_CONTRACTID,
},
};

Просмотреть файл

@ -16,7 +16,6 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
EnigmailLog: "chrome://openpgp/content/modules/log.jsm",
EnigmailCommandLine: "chrome://openpgp/content/modules/commandLine.jsm",
EnigmailVerify: "chrome://openpgp/content/modules/mimeVerify.jsm",
EnigmailMimeEncrypt: "chrome://openpgp/content/modules/mimeEncrypt.jsm",
EnigmailWindows: "chrome://openpgp/content/modules/windows.jsm",
@ -75,15 +74,6 @@ var EnigmailCore = {
},
shutdown(reason) {
EnigmailLog.DEBUG("core.jsm: shutdown():\n");
let cLineReg = EnigmailCommandLine.categoryRegistry;
Services.catMan.deleteCategoryEntry(
cLineReg.category,
cLineReg.entry,
false
);
if (this.factories) {
for (let fct of this.factories) {
fct.unregister();