Changeset ef65ae

Timestamp:

Oct 15, 2009, 10:13:04 PM (13 years ago)

Author:

rene <rene@…>

Branches:

lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9

Children:

47e482, 90d3d0

Parents:

c0fe7f

Message:

fix/enhancement for #161

Files:

• chrome/content/v_identity/vI_smartIdentity.js (modified) (2 diffs)
• defaults/preferences/preferences.js (modified) (1 diff)

chrome/content/v_identity/vI_smartIdentity.js

@@ -415 +415 @@
     
     __removeSmartIdentityFromRecipients : function(allIdentities, index) {
+        if (!vI.preferences.getBoolPref("idSelection_removeSmartIdentityFromRecipients")) return;
+        
+        // check if selected email is defined as doBcc address. If so, it should not be removed.
         var skip_bcc = false;
-        
         if (getCurrentIdentity().doBcc) {
             var bcc_addresses = new identityCollection();
@@ -427 +429 @@
             }
         }
+        
+        // check if there is more than one recipient for this mail. If not, preserve the only one existing.
+        var recipientCount = 0;
+        for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
+            var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
+            if (recipientType == "addr_to" || recipientType == "addr_cc") recipientCount++;
+        }
+        if (recipientCount < 2) return;
+        
         
         for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {

defaults/preferences/preferences.js

@@ -57 +57 @@
 pref("extensions.virtualIdentity.idSelection_autocreate", true);
 pref("extensions.virtualIdentity.idSelection_preferExisting", true);
+pref("extensions.virtualIdentity.idSelection_removeSmartIdentityFromRecipients", true);
 pref("extensions.virtualIdentity.autoReplyToSelf", false);
 pref("extensions.{dddd428e-5ac8-4a81-9f78-276c734f75b8}.description", "chrome://v_identity/locale/v_identity.properties");