Changeset 5da0a4


Ignore:
Timestamp:
Feb 11, 2017, 1:29:47 PM (5 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
0ff671
Parents:
3a0e2b
Message:

updated for current enigmail v1.9.x

Location:
modules/identityDataExtras
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • modules/identityDataExtras/PGPEncryption.js

    r3a0e2b r5da0a4  
    4040  this.option = "storageExtras_openPGP_messageEncryption"; // option string to get preference settings
    4141  this.enigmail_active = (typeof this._currentWindow.Enigmail != 'undefined');
    42 
    43   // enigmail preferences have changed into 1.7 - check for enigmail version
    44   if (this.enigmail_active && vc.compare(this._currentWindow.EnigmailCommon.getVersion(), "1.7") < 0) {
    45     this.elementID_msgCompose = "enigmail_encrypted_send";
    46     this.updateFunction_msgCompose = function () {
    47       (typeof (this._currentWindow.Enigmail.msg.setMenuSettings) == 'function') ? this._currentWindow.Enigmail.msg.setMenuSettings(''): null
    48     };
    49   } else {
    50     this.setValueToEnvironment_msgCompose = this.__new_setValueToEnvironment_msgCompose;
    51     this.getValueFromEnvironment_msgCompose = this.__new_getValueFromEnvironment_msgCompose;
    52   }
    5342}
    5443identityDataExtrasObject_PGPEncryption.prototype = {
     
    5948  },
    6049
    61   __new_setValueToEnvironment_msgCompose: function () {
     50  setValueToEnvironment_msgCompose: function () {
    6251    if (!this.enigmail_active || !this.active || (this.value == null))
    6352      return;
     
    7059  },
    7160
    72   __new_getValueFromEnvironment_msgCompose: function () {
     61  getValueFromEnvironment_msgCompose: function () {
    7362    if (this.enigmail_active && this.active) {
    7463      this.value = (
    75         this._currentWindow.Enigmail.msg.statusEncrypted == this._currentWindow.EnigmailCommon.ENIG_FINAL_YES ||
    76         this._currentWindow.Enigmail.msg.statusEncrypted == this._currentWindow.EnigmailCommon.ENIG_FINAL_FORCEYES) ? "true" : "false";
     64        this._currentWindow.Enigmail.msg.statusEncrypted == this._currentWindow.EnigmailConstants.ENIG_FINAL_YES ||
     65        this._currentWindow.Enigmail.msg.statusEncrypted == this._currentWindow.EnigmailConstants.ENIG_FINAL_FORCEYES) ? "true" : "false";
    7766    }
    7867  }
  • modules/identityDataExtras/PGPMIME.js

    r3a0e2b r5da0a4  
    4040  this.option = "storageExtras_openPGP_PGPMIME"; // option string to get preference settings
    4141  this.enigmail_active = (typeof this._currentWindow.Enigmail != 'undefined');
    42 
    43   // enigmail preferences have changed into 1.7 - check for enigmail version
    44   if (this.enigmail_active && vc.compare(this._currentWindow.EnigmailCommon.getVersion(), "1.7") < 0) {
    45     this.elementID_msgCompose = "enigmail_sendPGPMime";
    46     this.updateFunction_msgCompose = function () {
    47       (typeof (this._currentWindow.Enigmail.msg.setMenuSettings) == 'function') ? this._currentWindow.Enigmail.msg.setMenuSettings(''): null
    48     };
    49   } else {
    50     this.setValueToEnvironment_msgCompose = this.__new_setValueToEnvironment_msgCompose;
    51     this.getValueFromEnvironment_msgCompose = this.__new_getValueFromEnvironment_msgCompose;
    52   }
    5342}
    5443identityDataExtrasObject_PGPMIME.prototype = {
     
    5948  },
    6049
    61   __new_setValueToEnvironment_msgCompose: function () {
     50  setValueToEnvironment_msgCompose: function () {
    6251    if (!this.enigmail_active || !this.active || (this.value == null))
    6352      return;
     
    7059  },
    7160
    72   __new_getValueFromEnvironment_msgCompose: function () {
     61  getValueFromEnvironment_msgCompose: function () {
    7362    if (this.enigmail_active && this.active) {
    7463      this.value = (
    75         this._currentWindow.Enigmail.msg.statusPGPMime == this._currentWindow.EnigmailCommon.ENIG_FINAL_YES ||
    76         this._currentWindow.Enigmail.msg.statusPGPMime == this._currentWindow.EnigmailCommon.ENIG_FINAL_FORCEYES) ? "true" : "false";
     64        this._currentWindow.Enigmail.msg.statusPGPMime == this._currentWindow.EnigmailConstants.ENIG_FINAL_YES ||
     65        this._currentWindow.Enigmail.msg.statusPGPMime == this._currentWindow.EnigmailConstants.ENIG_FINAL_FORCEYES) ? "true" : "false";
    7766    }
    7867  }
  • modules/identityDataExtras/PGPSignature.js

    r3a0e2b r5da0a4  
    4040  this.option = "storageExtras_openPGP_messageSignature"; // option string to get preference settings
    4141  this.enigmail_active = (typeof this._currentWindow.Enigmail != 'undefined');
    42 
    43   // enigmail preferences have changed into 1.7 - check for enigmail version
    44   if (this.enigmail_active && vc.compare(this._currentWindow.EnigmailCommon.getVersion(), "1.7") < 0) {
    45     this.elementID_msgCompose = "enigmail_signed_send";
    46     this.updateFunction_msgCompose = function () {
    47       (typeof (this._currentWindow.Enigmail.msg.setMenuSettings) == 'function') ? this._currentWindow.Enigmail.msg.setMenuSettings(''): null
    48     };
    49   } else {
    50     this.setValueToEnvironment_msgCompose = this.__new_setValueToEnvironment_msgCompose;
    51     this.getValueFromEnvironment_msgCompose = this.__new_getValueFromEnvironment_msgCompose;
    52   }
    5342}
    5443identityDataExtrasObject_PGPSignature.prototype = {
     
    6453  },
    6554
    66   __new_setValueToEnvironment_msgCompose: function () {
     55  setValueToEnvironment_msgCompose: function () {
    6756    if (!this.enigmail_active || !this.active || (this.value == null))
    6857      return;
     
    7564  },
    7665
    77   __new_getValueFromEnvironment_msgCompose: function () {
     66  getValueFromEnvironment_msgCompose: function () {
    7867    if (this.enigmail_active && this.active) {
    7968      this.value = (
    80         this._currentWindow.Enigmail.msg.statusSigned == this._currentWindow.EnigmailCommon.ENIG_FINAL_YES ||
    81         this._currentWindow.Enigmail.msg.statusSigned == this._currentWindow.EnigmailCommon.ENIG_FINAL_FORCEYES) ? "true" : "false";
     69        this._currentWindow.Enigmail.msg.statusSigned == this._currentWindow.EnigmailConstants.ENIG_FINAL_YES ||
     70        this._currentWindow.Enigmail.msg.statusSigned == this._currentWindow.EnigmailConstants.ENIG_FINAL_FORCEYES) ? "true" : "false";
    8271    }
    8372  }
Note: See TracChangeset for help on using the changeset viewer.