Changeset 542354

Timestamp:

Jan 4, 2010, 6:53:12 PM (13 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:

• chrome/content/v_identity/vI_msgIdentityCloneTools.js (modified) (2 diffs)

chrome/content/v_identity/vI_msgIdentityCloneTools.js

@@ -41 +41 @@
         
     signatureSwitch: function(existingIdentity) {
+        // always initialize Security/Enigmail-Options
+        try { setSecuritySettings(1); enigSetMenuSettings(''); } catch(vErr) { };
         if (!existingIdentity) {
             vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
@@ -63 +65 @@
                 var element = document.getElementById("enigmail_signed_send");
                 if (element.getAttribute("checked") == "true") {
-                    vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
-                    element.doCommand();
+                    var skipChangeGPGsign = false;
+                    // sometimes GPG delays changing with dialog, so don't act if EnigmailAlertWindow is open to prevent double changes
+                    var windows = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                        .getService(Components.interfaces.nsIWindowWatcher).getWindowEnumerator();
+                    while (windows.hasMoreElements()) {
+                        var window = windows.getNext();
+                        skipChangeGPGsign = skipChangeGPGsign || (window.document.title == EnigGetString("enigAlert"));
+                    }
+                    if (skipChangeGPGsign)
+                        vI_notificationBar.dump("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
+                    else {
+                        vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
+                        element.doCommand();
+                    }
                 }
             }