Changeset 4062d1


Ignore:
Timestamp:
Aug 24, 2008, 5:47:05 PM (12 years ago)
Author:
rene <rene@…>
Branches:
master
Children:
ddb9c5
Parents:
bb5f98
Message:

removed option to copy enigmail presets, not required because enigmail works (hopefully always) before creating the new vI account.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_account.js

    rbb5f98 r4062d1  
    6262            vI_account._copyIntAttribute("encryptionpolicy");
    6363        }
     64/*      seems not required, encryption happens before Virtual Identity account is created
    6465        if (vI.preferences.getBoolPref("copyEnigmailSettings")) {
    6566            // pgp/enigmail settings
     
    7374            vI_account._copyCharAttribute("openPgpUrlName");
    7475       
    75             vI_account._copyBoolAttribute("pgpSignEncrypted");
    76             vI_account._copyBoolAttribute("pgpSignPlain");
    7776            vI_account._copyIntAttribute("defaultEncryptionPolicy");
    78         }
     77        }   */
    7978        if (vI.preferences.getBoolPref("copyAttachVCardSettings")) {
    8079            // attach vcard
  • chrome/content/v_identity/vI_prefDialog.js

    rbb5f98 r4062d1  
    4141                "VIdent_identity.stationeryFolder",
    4242                "VIdent_identity.copySMIMESettings",
    43                 "VIdent_identity.copyEnigmailSettings",
    4443                "VIdent_identity.copyAttachVCardSettings",
    4544                "VIdent_identity.smart_reply",
     
    282281            document.getElementById("fccReplyFollowsParentBox").setAttribute("hidden", "true");
    283282        }
    284        
     283        if (!(typeof(enigSetMenuSettings)=="function")) {
     284            document.getElementById("openPGPencryption").setAttribute("hidden", "true");
     285        }
     286
    285287        vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
    286288        vI_prefDialog.base.smartReplyHideSignature();
  • chrome/content/v_identity/vI_prefDialog.xul

    rbb5f98 r4062d1  
    145145            <checkbox id="VIdent_identity.copySMIMESettings" label="&vI_prefDialog.SMIME.label;"
    146146                prefstring="copySMIMESettings"/>
    147             <checkbox id="VIdent_identity.copyEnigmailSettings" label="&vI_prefDialog.PGP.label;"
    148                 prefstring="copyEnigmailSettings"/>
    149147            <checkbox id="VIdent_identity.copyAttachVCardSettings" label="&vI_prefDialog.VCard.label;"
    150148                prefstring="copyAttachVCardSettings"/>
     
    382380                <checkbox id="VIdent_identity.storageExtras_sMime_messageSignature" label="&vI_prefDialog.storageExtras.sMime.messageSignature.label;"
    383381                    prefstring="storageExtras_sMime_messageSignature"/>
    384                 </vbox><spacer flex="1"/><vbox>
     382                </vbox><spacer flex="1"/><vbox id="openPGPencryption">
    385383                <label value="&vI_prefDialog.storageExtras.openPGP.label;"/>
    386384                <checkbox id="VIdent_identity.storageExtras_openPGP_messageEncryption" label="&vI_prefDialog.storageExtras.openPGP.messageEncryption.label;"
  • chrome/content/v_identity/vI_upgrade.js

    rbb5f98 r4062d1  
    172172                    "aBook_use_non_vI", "aBook_notification", "storeVIdentity", "experimental",
    173173                    "storage_use_for_smart_reply") },
    174                     { version : "0.5.3", prefs : Array("storage_use_for_smart_reply") } ];
     174                    { version : "0.5.3", prefs : Array("storage_use_for_smart_reply") },
     175                    { version : "0.5.6", prefs : Array("copyEnigmailSettings") } ];
    175176        // remove obsolete preference-tree virtualIdentity
    176177        for (i = 0; i < obsoletePrefs.length; i++) {
  • defaults/preferences/preferences.js

    rbb5f98 r4062d1  
    88pref("extensions.virtualIdentity.stationeryFolderPickerMode", "3");
    99pref("extensions.virtualIdentity.copySMIMESettings", false);
    10 pref("extensions.virtualIdentity.copyEnigmailSettings", false);
    1110pref("extensions.virtualIdentity.copyAttachVCardSettings", false);
    1211pref("extensions.virtualIdentity.show_smtp", false);
Note: See TracChangeset for help on using the changeset viewer.