Changeset 317c0c


Ignore:
Timestamp:
Sep 17, 2008, 12:32:33 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:
e6e7c6
Parents:
825513
Message:

collection of changes to 0.6 branch

Location:
chrome/content/v_identity
Files:
1 added
12 edited

Legend:

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

    r825513 r317c0c  
    230230        vI_account.account.defaultIdentity.setUnicharAttribute("fullName", identityData.fullName);
    231231       
    232         vI_account.account.defaultIdentity.smtpServerKey = identityData.smtp
     232        vI_account.account.defaultIdentity.smtpServerKey = identityData.smtp.key;
    233233
    234234        vI_notificationBar.dump("## vI_account: Stored virtualIdentity (name "
  • chrome/content/v_identity/vI_helper.js

    r825513 r317c0c  
     1/* ***** BEGIN LICENSE BLOCK *****
     2    This program is free software; you can redistribute it and/or modify
     3    it under the terms of the GNU General Public License as published by
     4    the Free Software Foundation; either version 2 of the License, or
     5    (at your option) any later version.
    16
     7    This program is distributed in the hope that it will be useful,
     8    but WITHOUT ANY WARRANTY; without even the implied warranty of
     9    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     10    GNU General Public License for more details.
    211
    3 function keyTranslator() { }
    4 keyTranslator.prototype = {
    5     SMTP_NAMES : null,
    6     ID_NAMES : null,
    7     DEFAULT_TAG : null,
    8     AccountManager : Components.classes["@mozilla.org/messenger/account-manager;1"]
    9                 .getService(Components.interfaces.nsIMsgAccountManager),
    10    
    11     __getSMTPnames : function () {
    12         this.SMTP_NAMES = [];
    13         var smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    14             .getService(Components.interfaces.nsISmtpService);
    15         var servers = smtpService.smtpServers;
    16        
    17         function addServer (SMTP_NAMES, server) {
    18             if (server instanceof Components.interfaces.nsISmtpServer &&
    19         !server.redirectorType)
    20                 SMTP_NAMES[server.key] = server.description?server.description:server.hostname
    21         }
    22        
    23         if (typeof(servers.Count) == "undefined")       // TB 3.x
    24             while (servers && servers.hasMoreElements())
    25                 addServer(this.SMTP_NAMES, servers.getNext());
    26         else                            // TB 2.x
    27             for (var i=0 ; i<servers.Count(); i++)
    28                 addServer(this.SMTP_NAMES,  servers.QueryElementAt(i,Components.interfaces.nsISmtpServer));
     12    You should have received a copy of the GNU General Public License
     13    along with this program; if not, write to the Free Software
     14    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    2915
    30         if (!this.DEFAULT_TAG) this.DEFAULT_TAG = document.getElementById("bundle_messenger").getString("defaultServerTag");
    31     },
    32     __getIDnames : function () {
    33         this.ID_NAMES = [];
    34         var accounts = queryISupportsArray(this.AccountManager.accounts, Components.interfaces.nsIMsgAccount);
    35         if (typeof(sortAccounts)=="function") // TB 3.x
    36             accounts.sort(sortAccounts);
    37         else if (typeof(compareAccountSortOrder)=="function") // TB 2.x
    38             accounts.sort(compareAccountSortOrder);
    39         for (var i in accounts) {
    40             var server = accounts[i].incomingServer;
    41             if (!server) continue;
    42             var identites = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
    43             for (var j in identites)
    44                 this.ID_NAMES[identites[j].key] = identites[j].identityName;
    45         }
    46         if (!this.DEFAULT_TAG) this.DEFAULT_TAG = document.getElementById("bundle_messenger").getString("defaultServerTag");
    47     },
    48     getSMTP : function (smtpKey) {
    49         if (!this.SMTP_NAMES) this.__getSMTPnames();
    50         return this.SMTP_NAMES[smtpKey];
    51     },
    52     getID : function (idKey) {
    53         if (!this.ID_NAMES) this.__getIDnames();
    54         return (this.ID_NAMES[idKey])?this.ID_NAMES[idKey]:null;
    55     },
    56     getSMTPname : function (smtpKey) {
    57         if (!this.SMTP_NAMES) this.__getSMTPnames();
    58         return this.SMTP_NAMES[smtpKey]?this.SMTP_NAMES[smtpKey]:this.DEFAULT_TAG
    59     },
    60     getIDname : function (idKey) {
    61         if (!this.ID_NAMES) this.__getIDnames();
    62         return this.ID_NAMES[idKey]?this.ID_NAMES[idKey]:""
    63     },
    64     isValidSMTP : function (smtpKey) {
    65         if (!this.SMTP_NAMES) this.__getSMTPnames();
    66         return (!smtpKey || this.SMTP_NAMES[smtpKey]?true:false)
    67     },
    68     isValidID : function (idKey) {
    69         if (!this.ID_NAMES) this.__getIDnames();
    70         return (!idKey || this.ID_NAMES[idKey]?true:false)
    71     }
    72 }
     16    The Original Code is the Virtual Identity Extension.
    7317
     18    The Initial Developer of the Original Code is Rene Ejury.
     19    Portions created by the Initial Developer are Copyright (C) 2007
     20    the Initial Developer. All Rights Reserved.
    7421
     22    Contributor(s):
     23 * ***** END LICENSE BLOCK ***** */
    7524
    7625var vI_helper = {
     
    10352    },
    10453
    105 /*vI_upgrade.js:229:
    106 vI_upgrade.js:232:*/
     54// vI_upgrade.js:229:
     55// vI_upgrade.js:232:
    10756    combineNames : function (fullName, email) {
    10857        if (fullName && fullName.replace(/^\s+|\s+$/g,"")) return fullName.replace(/^\s+|\s+$/g,"") + " <" + email.replace(/^\s+|\s+$/g,"") + ">"
     
    11059    },
    11160   
    112 // vI_rdfDataEditor.js:80:         elem.value = address.combinedName;
    113 // vI_rdfDatasource.js:119:                if (!parsed.combinedName) {
    114 // vI_rdfDatasource.js:123:                vI_notificationBar.dump("## vI_rdfDatasource: __getRDFResourceForVIdentity: recDescription=" + parsed.combinedName + "\n")
    115 // vI_rdfDatasource.js:130:                return vI_rdfDatasource.rdfService.GetResource(vI_rdfDatasource.rdfNS + rdfNSRecType + parsed.combinedName);
    116 // vI_upgrade.js:225:              //~ alert(splitted.email + "++" + splitted.name + "++" + splitted.combinedName)
    117 // vI_upgrade.js:256:                       combinedName: name + " <" + email + ">"}
    118 
     61// vI_rdfDataEditor.js:80:
     62// vI_rdfDatasource.js:119:
     63// vI_rdfDatasource.js:123:
     64// vI_rdfDatasource.js:130:
     65// vI_upgrade.js:225:
     66// vI_upgrade.js:256:
    11967    parseAddress : function(address) {
    120         //~ vI_notificationBar.dump("## v_identity: getAddress: parsing '" + address + "'\n")
    12168        var name = ""; var email = "";
    12269        // prefer an email address separated with < >, only if not found use any other
  • chrome/content/v_identity/vI_rdfDataEditor.xul

    r825513 r317c0c  
    3636
    3737<script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataEditor.js" />
     38<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
    3839<script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" />
    3940<script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
    4041<script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
    41 <script type="application/x-javascript" src="chrome://v_identity/content/vI_smtpSelector.js" />
    4242<script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
    4343<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
  • chrome/content/v_identity/vI_rdfDataTree.js

    r825513 r317c0c  
    5858                typeCol : document.getElementById("vI_rdfDataTreeBundle").getString("vI_rdfDataTree.dataType." + type),
    5959                senderCol : localIdentityData.combinedName,
    60                 smtpCol : localIdentityData.smtpName,
    61                 smtpKey : localIdentityData.smtp,
    62                 idCol : localIdentityData.idName,
    63                 idKey : localIdentityData.id,
     60                smtpCol : localIdentityData.smtp.value,
     61                smtpKey : localIdentityData.smtp.key,
     62                idCol : localIdentityData.id.value,
     63                idKey : localIdentityData.id.key,
    6464                resource : resource }
    6565       
  • chrome/content/v_identity/vI_rdfDatasource.js

    r825513 r317c0c  
    228228        vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email)
    229229        vI_rdfDatasource.__setRDFValue(resource, "fullName", localIdentityData.fullName)
    230         if (storeBaseID) vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id)
    231         vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp)
     230        if (storeBaseID) vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id.key)
     231        vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp.key)
    232232       
    233233        localIdentityData.extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
  • chrome/content/v_identity/vI_smartReplyDialog.js

    r825513 r317c0c  
    3636
    3737            if (vI_smartReply_dialog.all_addresses.identityDataCollection[index].id)
    38                 id = vI_smartReply_dialog.all_addresses.identityDataCollection[index].idName;
     38                id = vI_smartReply_dialog.all_addresses.identityDataCollection[index].id.value;
    3939            if (vI_smartReply_dialog.all_addresses.identityDataCollection[index].smtp)
    40                 smtp = vI_smartReply_dialog.all_addresses.identityDataCollection[index].smtpName;
     40                smtp = vI_smartReply_dialog.all_addresses.identityDataCollection[index].smtp.value;
    4141
    4242            menuentry += (id?" (" + id + "," +
  • chrome/content/v_identity/vI_storage.js

    r825513 r317c0c  
    2727* thanks to Mike Krieger and Sebastian Apel
    2828*/
    29 
    30 function identityData(email, fullName, id, smtp, extras, sideDescription) {
    31     this.__keyTranslator = new keyTranslator();
    32     this.smtpService =
    33             Components.classes["@mozilla.org/messengercompose/smtp;1"].getService(Components.interfaces.nsISmtpService);
    34     this.email = email;
    35     this.fullName = (fullName?fullName:'');
    36     this.id = (this.__keyTranslator.isValidID(id))?id:"";
    37     this.smtp = (this.__keyTranslator.isValidSMTP(smtp))?smtp:""
    38     this.extras = extras?extras:new vI_storageExtras();
    39     this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
    40         compareID : null,
    41         equals : { fullName : {}, email : {}, smtpName : {}, idName : {}, extras : {} }
    42     }
    43     if (sideDescription) this.sideDescription = sideDescription;
    44     else if (this.idName) this.sideDescription = " - " + this.idName;
    45 }
    46 identityData.prototype = {
    47     email : null,
    48     fullName : null,
    49     id : null,
    50     smtp : null,
    51     extras : null,
    52     sideDescription : null,
    53 
    54     comp : null,   
    55 
    56     __keyTranslator : null,
    57     smtpService : null,
    58     ignoreFullNameWhileComparing : false,
    59 
    60     get combinedName() {
    61         var email = this.email?this.email.replace(/^\s+|\s+$/g,""):"";
    62         var fullName = this.fullName?this.fullName.replace(/^\s+|\s+$/g,""):"";
    63         return fullName?fullName+" <"+email+">":email
    64     },
    65     set combinedName(combinedName) {
    66         var name = ""; var email = "";
    67         // prefer an email address separated with < >, only if not found use any other
    68         if (combinedName.match(/<\s*[^>\s]*@[^>\s]*\s*>/) || combinedName.match(/<?\s*[^>\s]*@[^>\s]*\s*>?/) || combinedName.match(/$/)) {
    69             name = RegExp.leftContext + RegExp.rightContext
    70             email = RegExp.lastMatch
    71             email = email.replace(/\s+|<|>/g,"")
    72             name = name.replace(/^\s+|\s+$/g,"")
    73             name = name.replace(/^\"|\"$/g,"")
    74             name = name.replace(/^\'|\'$/g,"")
    75         }
    76         this.fullName = name;
    77         this.email = email;
    78     },
    79     get idName() { return this.__keyTranslator.getIDname(this.id); },
    80     get smtpName() { return this.__keyTranslator.getSMTPname(this.smtp); },
    81 
    82     __makeHtml : function (string) { return string?string.replace(/>/g,"&gt;").replace(/</g,"&lt;"):"" },
    83     get idHtml() { return this.__makeHtml(this.idName); },
    84     get smtpHtml() { return this.__makeHtml(this.smtpName); },
    85     get fullNameHtml() { return this.__makeHtml(this.fullName); },
    86     get emailHtml() { return this.__makeHtml(this.email); },
    87     get combinedNameHtml() { return this.__makeHtml(this.combinedName); },
    88 
    89     get idLabel() { return vI.elements.strings.getString("vident.identityData.baseID") },
    90     get smtpLabel() { return vI.elements.strings.getString("vident.identityData.SMTP") },
    91     get fullNameLabel() { return vI.elements.strings.getString("vident.identityData.Name") },
    92     get emailLabel() { return vI.elements.strings.getString("vident.identityData.Address") },
    93 
    94     // creates an Duplicate of the current IdentityData, cause usually we are working with a pointer
    95     getDuplicate : function() {
    96         return new identityData(this.email, this.fullName, this.id, this.smtp, this.extras.getDuplicate(), this.sideDescription);
    97     },
    98 
    99     isExistingIdentity : function() {
    100         var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
    101         for (var i in accounts) {
    102             // skip possible active VirtualIdentity Accounts
    103             try { vI_account.prefroot.getBoolPref("mail.account."+accounts[i].key+".vIdentity"); continue; } catch (e) { };
    104    
    105             var identities = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
    106             for (var j in identities) {
    107                 if (    (this.ignoreFullNameWhileComparing || this.fullName == identities[j].fullName) &&
    108                     (this.email == identities[j].email) &&
    109                     this.__equalSMTP(identities[j].smtpServerKey)   ) {
    110                     vI_notificationBar.dump("## vI_storage: isExistingIdentity: " + this.combinedName + " found, id='" + identities[j].key + "'\n");
    111                     return identities[j].key;
    112                 }
    113             }
    114         }
    115         vI_notificationBar.dump("## vI_storage: isExistingIdentity: " + this.combinedName + " not found\n");
    116         return null;
    117     },
    118 
    119     __equalSMTP : function(compareSmtp) {
    120         var mainSmtp = this.smtp;
    121         if (!mainSmtp || !this.__keyTranslator.isValidSMTP(mainSmtp)) mainSmtp = this.smtpService.defaultServer.key;
    122         if (!compareSmtp || !this.__keyTranslator.isValidSMTP(compareSmtp)) compareSmtp = this.smtpService.defaultServer.key;
    123         return (mainSmtp == compareSmtp);
    124     },
    125    
    126     __equalID : function(compareID) {
    127         // if basic ID is not set (default) than answer equal
    128         if (!this.__keyTranslator.getID(this.id)) return true;
    129         return (this.id == compareID);
    130     },
    131 
    132     __equalsIdentity : function(identity) {
    133         var testIdentity = new identityData(
    134             identity.email,
    135             identity.fullName,
    136             identity.key,
    137             identity.smtpServerKey)
    138         testIdentity.extras.readIdentityValues(identity);
    139         return (this.equals(testIdentity));
    140     },
    141 
    142     equals : function(compareIdentityData) {
    143         this.comp.compareID = compareIdentityData;
    144 
    145         this.comp.equals.fullName = (this.ignoreFullNameWhileComparing || this.fullName == compareIdentityData.fullName)
    146         this.comp.equals.email = (this.email == compareIdentityData.email)
    147         this.comp.equals.smtpName = this.__equalSMTP(compareIdentityData.smtp);
    148         this.comp.equals.idName = this.__equalID(compareIdentityData.id);
    149         this.comp.equals.extras = this.extras.equal(compareIdentityData.extras);
    150 
    151         return (this.comp.equals.fullName && this.comp.equals.email && this.comp.equals.smtpName && this.comp.equals.idName && this.comp.equals.extras)
    152     },
    153 
    154     equalsCurrentIdentity : function(getCompareMatrix) {
    155         var compareIdentityData = document.getElementById("msgIdentity_clone").identityData;
    156         var retValue = { equal : null, compareMatrix : null };
    157         retValue.equal = this.equals(compareIdentityData);
    158         if (getCompareMatrix && !retValue.equal) // generate CompareMatrix only if asked and non-equal
    159             retValue.compareMatrix = this.getCompareMatrix();
    160         return retValue;
    161     },
    162 
    163     getCompareMatrix : function() {
    164         const Items = Array("fullName", "email", "smtp", "id");
    165         var string = "";       
    166         var saveBaseId = (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
    167         for each (item in Items) {
    168             var classEqual = (this.comp.equals[item])?"equal":"unequal";
    169             var classBaseID = ((!saveBaseId) && (item == "id"))?" ignoreBaseId":""
    170             string += "<tr>" +
    171                 "<td class='col1 " + classEqual + "'>" + this[item+"Label"] + "</td>" +
    172                 "<td class='col2 " + classEqual + classBaseID + "'>" + this.comp.compareID[item+"Html"] + "</td>" +
    173                 "<td class='col3 " + classEqual + classBaseID + "'>" + this[item+"Html"] + "</td>" +
    174                 "</tr>"
    175         }
    176         string += this.extras.getCompareMatrix();
    177         return string;
    178     },
    179 
    180     getMatrix : function() {
    181         const Items = Array("smtp", "id");
    182         var string = "";
    183         for each (item in Items) if (this[item+"Html"])
    184             string += "<tr><td class='col1'>" + this[item+"Label"] + ":</td>" +
    185                 "<td class='col2'>" + this[item+"Html"] + "</td></tr>"
    186         string += this.extras.getMatrix();
    187         return string;     
    188     }
    189 }
    190 
    191 function identityCollection() {
    192     this.number = 0;
    193     this.identityDataCollection = {};
    194     this.menuItems = {};
    195 }
    196 identityCollection.prototype =
    197 {
    198     number : null,
    199     identityDataCollection : null,
    200     menuItems : null,
    201    
    202     mergeWithoutDuplicates : function(addIdentityCollection) {
    203         for (var index = 0; index < addIdentityCollection.number; index++)
    204             this.addWithoutDuplicates(addIdentityCollection.identityDataCollection[index])
    205     },
    206 
    207     addWithoutDuplicates : function(identityData) {
    208         for (var index = 0; index < this.number; index++) {
    209             if (this.identityDataCollection[index].email == identityData.email &&
    210                 (!this.identityDataCollection[index].id || !identityData.id ||
    211                     (this.identityDataCollection[index].id == identityData.id &&
    212                     this.identityDataCollection[index].smtp == identityData.smtp))) {
    213                 // found, so check if we can use the Name of the new field
    214                 if (this.identityDataCollection[index].fullName == "" && identityData.fullName != "") {
    215                     this.identityDataCollection[index].fullName = identityData.fullName;
    216                     vI_notificationBar.dump("## identityCollection:   added fullName '" + identityData.fullName
    217                         + "' to stored email '" + this.identityDataCollection[index].email +"'\n")
    218                 }
    219                 // check if id_key, smtp_key or extras can be used
    220                 // only try this once, for the first Identity where id is set)
    221                 if (!this.identityDataCollection[index].id && identityData.id) {
    222                     this.identityDataCollection[index].id = identityData.id;
    223                     this.identityDataCollection[index].smtp = identityData.smtp;
    224                     this.identityDataCollection[index].extras = identityData.extras;
    225                     vI_notificationBar.dump("## identityCollection:   added id '" + identityData.id
    226                         + "' smtp '" + identityData.smtp + "' (+extras) to stored email '" + this.identityDataCollection[index].email +"'\n")
    227                 }
    228                 return;
    229             }
    230         }
    231         vI_notificationBar.dump("## identityCollection:   add new address to result: " + identityData.combinedName + "\n")
    232         this.identityDataCollection[index] = identityData;
    233         this.number = index + 1;
    234     },
    235    
    236     // this is used to completely use the conten of another identityCollection, but without changing all pointers
    237     // see for instance vI_smartIdentity.__filterAddresses
    238     takeOver : function(newIdentityCollection) {
    239         this.number = newIdentityCollection.number
    240         this.identityDataCollection = newIdentityCollection.identityDataCollection
    241     }
    242 };
    24329
    24430var vI_storage = {
  • chrome/content/v_identity/vI_upgrade.xul

    r825513 r317c0c  
    4343<script type="application/x-javascript" src="chrome://v_identity/content/vI_account.js" />
    4444<script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
     45<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
    4546<script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
    4647<script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
  • chrome/content/v_identity/vI_upgradeOverlay.xul

    r825513 r317c0c  
    4444    <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
    4545    <script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
     46    <script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
    4647    <script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
    4748    <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
  • chrome/content/v_identity/v_identity.js

    r825513 r317c0c  
    264264       
    265265        // clean all elements
    266 //      vI_smtpSelector.clean();
    267266        document.getElementById("msgIdentity_clone").clean();
    268267        vI_msgIdentityCloneTools.cleanReplyToFields();
    269         //~ vI_storage.clean();
    270268        vI_smartIdentity.clean();
    271269        vI_notificationBar.dump("## v_identity: everything cleaned.\n")
  • chrome/content/v_identity/v_identity.xml

    r825513 r317c0c  
    131131       
    132132        this.label = this._identityDataStorage.combinedName;
    133         this.value = this._identityDataStorage.id;
     133        this.value = this._identityDataStorage.id.key;
    134134        this.description = this._identityDataStorage.sideDescription;
    135135       
     
    346346                MenuItem.identityData = localIdentityData;
    347347            MenuItem.setAttribute("class", "identity_clone-popup-item");
    348             MenuItem.value = localIdentityData.id;
     348            MenuItem.value = localIdentityData.id.value;
    349349
    350350            // set vid explicitely
     
    453453        ]]></body>
    454454    </method>
    455     <property name="smtp" onget="return this.identityData.smtp;" >
     455    <property name="smtp" onget="return this.identityData.smtp.key;" >
    456456        <setter><![CDATA[
    457         this.identityData.smtp = val;
     457        this.identityData.smtp.key = val;
    458458       
    459459        document.getElementById("vI_tooltipPopupset").addTooltip(this);
     
    475475           
    476476            if (oldIdentityData) { // indicates that it's not first time after clean
    477                 if (!this._identityDataStorage.id) {
    478                     this._identityDataStorage.id = oldIdentityData.id;
    479                     var idName = this._identityDataStorage.idName;
     477                if (!this._identityDataStorage.id.key) {
     478                    this._identityDataStorage.id.key = oldIdentityData.id.key;
     479                    var idName = this._identityDataStorage.id.value;
    480480                    this._identityDataStorage.sideDescription = (idName)?" - "+idName:"";
    481481                }
     
    487487           
    488488            this.label = this._identityDataStorage.combinedName;
    489             this.value = this._identityDataStorage.id;
     489            this.value = this._identityDataStorage.id.key;
    490490            this.description = this._identityDataStorage.sideDescription;
    491491            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp;
  • chrome/content/v_identity/v_identity.xul

    r825513 r317c0c  
    3939<script type="application/x-javascript" src="chrome://v_identity/content/v_identity.js" />
    4040<script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
     41<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
    4142<script type="application/x-javascript" src="chrome://v_identity/content/vI_account.js" />
    4243<script type="application/x-javascript" src="chrome://v_identity/content/vI_msgIdentityCloneTools.js" />
Note: See TracChangeset for help on using the changeset viewer.