Changeset afd8b0

Timestamp:

Oct 8, 2011, 7:46:28 PM (9 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

c272bf

Parents:

41266a

Message:

updated conversation plugin

File:

• chrome/content/v_identity/modules/plugins/conversation.js (modified) (4 diffs)

chrome/content/v_identity/modules/plugins/conversation.js

@@ -22 +22 @@
 let _rdfDatasourceAccess;
 
-function changeIdentityToSmartIdentity(allIdentities, index) {
+let changeIdentityToSmartIdentity = function(allIdentities, index) {
   _changeIdentityToSmartIdentity(allIdentities.identityDataCollection[index]);
-}
+};
 
-function _changeIdentityToSmartIdentity(identityData) {
+let _changeIdentityToSmartIdentity = function(identityData) {
   Log.debug("## changeIdentityToSmartIdentity\n");
   // add code to set stored base identity
@@ -41 +41 @@
   }
   virtualSenderNameElem.text(identityData.combinedName); // change this also to reflect changes of base id
-}
+};
 
 let conversationHook = {
-  onComposeSessionConstructDone: function (params, match, senderNameElem, ExternalLog) {
+  onComposeSessionConstructDone: function (recipientString, params, senderNameElem, ExternalLog) {
     // this.params = { identity: ???, msgHdr: ???, subject: ??? };
     Log = ExternalLog;
@@ -51 +51 @@
     virtualIdentityData = null; virtualIdInUse = false; virtualIdSenderName = "";
     
-    
-    let recipientString = params.msgHdr.mime2DecodedRecipients;
-    if (params.identity.doCc) recipientString += "," + params.identity.doCcList;
-    recipientString += "," + params.msgHdr.ccList;
-    
     let recipients = []; var combinedNames = {}; var number;
     number = HeaderParser.parseHeadersWithArray(recipientString, {}, {}, combinedNames);
     for (var index = 0; index < number; index++)
       recipients.push( { recipient: combinedNames.value[index], recipientType: "addr_to" } )
-  
-/*    match({
-      reply: function (aMessage, aReplyType) {
-        if (aReplyType == "replyAll") { // if we reply to all then take care of all the recipients
-
-          Log.debug("replyAll - adding cc recipients too");
-          number = HeaderParser.parseHeadersWithArray(params.msgHdr.ccList, {}, {}, combinedNames);
-          for (var index = 0; index < number; index++)
-            recipients.push( { recipient: combinedNames.value[index], recipientType: "addr_to" } )
-        }
-      },
-      draft: function ({ msgUri }) { Log.debug("match draft - currently not used", msgUri); }
-    });*/
       
     var localSmartIdentityCollection = new vI.smartIdentityCollection(params.msgHdr, params.identity, false, false, recipients);
@@ -82 +64 @@
       var existingIDIndex = localSmartIdentityCollection._foundExistingIdentity();
       if (existingIDIndex) {
-        Log.debug("## smartIdentity: found existing Identity, use without interaction.\n");
-        changeIdentityToSmartIdentity(localSmartIdentityCollection._allIdentities, existingIDIndex);
+        Log.debug("## smartIdentity: found existing Identity, use without interaction.\n", existingIDIndex.key);
+        changeIdentityToSmartIdentity(localSmartIdentityCollection._allIdentities, existingIDIndex.key);
         return;
       }