Changeset bf9fed


Ignore:
Timestamp:
Sep 17, 2008, 6:59:48 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:
19daa3
Parents:
e6e7c6
Message:

bugfix: detection of mailinglist's was broken

Location:
chrome/content/v_identity
Files:
2 edited

Legend:

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

    re6e7c6 rbf9fed  
    3333    rdfNSMaillist : "vIStorage/maillist/",
    3434    rdfNSNewsgroup : "vIStorage/newsgroup/",
     35    rdfNSFilter : "vIStorage/filter/",
    3536   
    3637    // seamonkey doesn't have a extensionmanager, so read version of extension from hidden version-label
     
    116117    __getRDFResourceForVIdentity : function (recDescription, recType) {
    117118        if (!vI_rdfDatasource.rdfDataSource) return null;
    118         var parsed = vI_helper.parseAddress(recDescription)
    119         if (!parsed.combinedName) {
     119        if (!recDescription) {
    120120            vI_notificationBar.dump("## vI_rdfDatasource: __getRDFResourceForVIdentity: no Recipient given.\n");
    121121            return null;
     
    127127            case "maillist" : rdfNSRecType = vI_rdfDatasource.rdfNSMaillist; break;
    128128        }
    129         return vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType + parsed.combinedName);
     129        return vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType + recDescription);
    130130    },
    131131   
  • chrome/content/v_identity/vI_storage.js

    re6e7c6 rbf9fed  
    168168        else if (vI_storage.isMailingList(recipient))
    169169            return { recDesc : vI_storage.getMailListName(recipient), recType : "maillist" }
    170         else return { recDesc : recipient, recType : "email" }
     170        else
     171            return { recDesc : vI_helper.parseAddress(recipient).combinedName, recType : "email" }
    171172    },
    172173       
     
    282283                var currentCard = childCards.currentItem();
    283284                currentCard.QueryInterface(Components.interfaces.nsIAbCard);
    284                 returnVar = callFunction(addrbook, currentCard, returnVar);
     285                callFunction(addrbook, currentCard, returnVar);
    285286                try { childCards.next(); } catch (ex) { keepGoing = 0; }
    286287            }
     
    296297        var queryString = "?(or(DisplayName,c," + encodeURIComponent(vI_storage.getMailListName(recipient)) + "))"
    297298        var returnVar = vI_storage._walkTroughCards(queryString, vI_storage._isMailingListCard,
    298             { mailListName : recipient, isMailList : false } )
     299            { mailListName : vI_storage.getMailListName(recipient), isMailList : false } )
    299300        return returnVar.isMailList;
    300301    }, 
     
    302303    _isMailingListCard : function (addrbook, Card, returnVar) {
    303304    // returnVar = { mailListName : mailListName, isMailList : false }
    304         return { mailListName : returnVar.mailListName,
    305             isMailList : (returnVar.isMailList ||
    306             Card.isMailList && Card.displayName.toLowerCase() == returnVar.mailListName.toLowerCase()) }
     305        returnVar.isMailList = (returnVar.isMailList ||
     306            Card.isMailList && Card.displayName.toLowerCase() == returnVar.mailListName.toLowerCase() )
    307307    },
    308308   
Note: See TracChangeset for help on using the changeset viewer.