Changeset 94dbb3


Ignore:
Timestamp:
Oct 14, 2009, 11:31:02 PM (10 years ago)
Author:
rene <rene@…>
Branches:
lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9
Children:
fc79c2
Parents:
ca2918
Message:

bugfix: never accept unset SMTP in menu

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/v_identity.xml

    rca2918 r94dbb3  
    229229    <property name="smtp" onget="return this._smtpMenu.selectedItem.getAttribute('key');" >
    230230        <setter><![CDATA[
    231         // if (val == null) return; // dont overwrite if not set
     231        if (val == NO_SMTP_TAG) return; // dont overwrite if not set
    232232        vI_notificationBar.dump("** v_identity.xml smtp set to '" + val + "'\n")
    233233        var MenuItems = this._smtpPopup.childNodes
     
    344344        }
    345345        this._msgIdentityPopupElem.doCommand();
    346         ]]></body>
     346       
     347        // if current SMTP is empty, take the one from current Identity
     348        if (this.identityData.smtp.hasNoDefinedSMTP()) {
     349            this.identityData.smtp.key = gAccountManager.getIdentity(this.value).smtpServerKey;
     350            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this.identityData.smtp.keyNice;
     351            this.checkForVirtualIdentity();
     352        }
     353    ]]></body>
    347354    </method>   
    348355    <method name="init">
     
    500507        ]]></body>
    501508    </method>
    502     <property name="smtp" onget="return this.identityData.smtp.key;" >
     509    <property name="smtp" onget="return this.identityData.smtp.key;" > // used to detect changes from SMTP-Menu
    503510        <setter><![CDATA[
    504511        this.identityData.smtp.key = val;
     
    527534                    var idName = this._identityDataStorage.id.value;
    528535                    this._identityDataStorage.sideDescription = (idName)?" - "+idName:"";
    529                 }
    530                 else if (this._identityDataStorage.smtp.hasNoDefinedSMTP()) {
    531                     this._identityDataStorage.smtp.key = oldIdentityData.smtp.key;
    532                     vI_notificationBar.dump("** v_identity.xml use previous SMTP: '" + this._identityDataStorage.smtp.key + "'\n")
     536                    vI_notificationBar.dump("** v_identity.xml set new Id: '" + this._identityDataStorage.id.value + "'\n")
    533537                }
    534538                this._identityDataStorage.extras.setValues();
Note: See TracChangeset for help on using the changeset viewer.