Changeset 4e1f8f

Timestamp:

Sep 11, 2012, 9:17:57 PM (10 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

f9dc3c

Parents:

422911

Message:

use ReplyToSelf? with window parameter

Files:

• content/v_identity.js (modified) (2 diffs)
• modules/vI_replyToSelf.js (modified) (3 diffs)

content/v_identity.js

@@ -143 +143 @@
             
             if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now)
-              vI.addReplyToSelf();
+              vI.addReplyToSelf(window);
 
             var vid = document.getElementById("virtualIdentityExtension_msgIdentityClone").vid
@@ -253 +253 @@
     initSystemStage2 : function() {
         Log.debug("initSystemStage2.")
-        vI.initReplyTo();
+        vI.initReplyTo(window);
         vI.storage.init();
         vI.smartIdentity.init();

modules/vI_replyToSelf.js

@@ -30 +30 @@
 let Log = setupLogging("virtualIdentity.replyToSelf");
 
-function initReplyTo() {
+function initReplyTo(vIcomposeWindow) {
+  let replyToSelfObj = vIcomposeWindow.document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel");
   if (vIprefs.get("autoReplyToSelf")) {
     replyToSelfObj.removeAttribute("hidden");
-    removeAllReplyTos();
+    removeAllReplyTos(vIcomposeWindow, replyToSelfObj);
   }
   else
@@ -39 +40 @@
 };
 
-function removeAllReplyTos() {
+function removeAllReplyTos(vIcomposeWindow, replyToSelfObj) {
   if (!replyToSelfObj.hasAttribute("hidden")) {
     for (var row = 1; row <= vIcomposeWindow.top.MAX_RECIPIENTS; row ++) {
@@ -51 +52 @@
 };
 
-function addReplyToSelf() {
+function addReplyToSelf(vIcomposeWindow) {
+  let replyToSelfObj = vIcomposeWindow.document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel");
   if (!replyToSelfObj.hasAttribute("hidden")) {
-    try {
-      vIcomposeWindow.awAddRecipient("addr_reply",vIcomposeWindow.document.getElementById("virtualIdentityExtension_msgIdentityClone").label);
-      Log.debug("added ReplyToSelf");
-      replyToSelfObj.setAttribute("hidden","true");
-    } catch (e) { Log.debug("ReplyToSelf failed"); dumpCallStack(e); };
+    vIcomposeWindow.awAddRecipient("addr_reply",vIcomposeWindow.document.getElementById("virtualIdentityExtension_msgIdentityClone").label);
+    Log.debug("added ReplyToSelf");
+    replyToSelfObj.setAttribute("hidden","true");
   }
-}
-
-let replyToSelfObj = null;
-let vIcomposeWindow = Cc["@mozilla.org/appshell/window-mediator;1"]
-  .getService(Ci.nsIWindowMediator)
-  .getMostRecentWindow(null);
-vIcomposeWindow.addEventListener("load", function () {
-  replyToSelfObj = vIcomposeWindow.document.getElementById("virtualIdentityExtension_autoReplyToSelfLabel");
-  }, false);
+};