Changeset 542354


Ignore:
Timestamp:
Jan 4, 2010, 6:53:12 PM (12 years ago)
Author:
rene <rene@…>
Branches:
multiEdit, ng_0.6, ng_0.8, ng_0.9
Children:
bb165c
Parents:
e7fa0c
Message:

modified hiding of SMIME/GPG signatures to be more robust

File:
1 edited

Legend:

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

    re7fa0c r542354  
    4141       
    4242    signatureSwitch: function(existingIdentity) {
     43        // always initialize Security/Enigmail-Options
     44        try { setSecuritySettings(1); enigSetMenuSettings(''); } catch(vErr) { };
    4345        if (!existingIdentity) {
    4446            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
     
    6365                var element = document.getElementById("enigmail_signed_send");
    6466                if (element.getAttribute("checked") == "true") {
    65                     vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
    66                     element.doCommand();
     67                    var skipChangeGPGsign = false;
     68                    // sometimes GPG delays changing with dialog, so don't act if EnigmailAlertWindow is open to prevent double changes
     69                    var windows = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
     70                        .getService(Components.interfaces.nsIWindowWatcher).getWindowEnumerator();
     71                    while (windows.hasMoreElements()) {
     72                        var window = windows.getNext();
     73                        skipChangeGPGsign = skipChangeGPGsign || (window.document.title == EnigGetString("enigAlert"));
     74                    }
     75                    if (skipChangeGPGsign)
     76                        vI_notificationBar.dump("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
     77                    else {
     78                        vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
     79                        element.doCommand();
     80                    }
    6781                }
    6882            }
Note: See TracChangeset for help on using the changeset viewer.