Changeset 3aa877


Ignore:
Timestamp:
Oct 3, 2013, 3:45:18 PM (8 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
538e3f
Parents:
f97c94
Message:

fix for https://hg.mozilla.org/comm-central/rev/fab9e5145cd4

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/vI_rdfAccountMismatchDialog.xml

    rf97c94 r3aa877  
    204204            this.appendChild(menuitem);
    205205           
    206             var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    207                 .getService(Components.interfaces.nsISmtpService).smtpServers;
     206            var servers, smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
     207                .getService(Components.interfaces.nsISmtpService);
     208            <!-- check for new https://hg.mozilla.org/comm-central/rev/fab9e5145cd4 smtpService -->
     209            if (typeof(smtpService.servers) == "object") servers = smtpService.servers;
     210            else servers = smtpService.smtpServers;
     211
    208212            while (servers && servers.hasMoreElements()) {
    209213                var server = servers.getNext();
  • content/bindings/v_identity.xml

    rf97c94 r3aa877  
    231231            this._addDefaultServer();
    232232            this._smtpPopup.appendChild(document.createElement("menuseparator"));
    233 
    234             var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    235                 .getService(Components.interfaces.nsISmtpService).smtpServers;
    236233           
     234            var servers, smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
     235                .getService(Components.interfaces.nsISmtpService);
     236            <!-- check for new https://hg.mozilla.org/comm-central/rev/fab9e5145cd4 smtpService -->
     237            if (typeof(smtpService.servers) == "object") servers = smtpService.servers;
     238            else servers = smtpService.smtpServers;
     239           
    237240            while (servers && servers.hasMoreElements())
    238241                this._addServer(servers.getNext());
  • modules/vI_identityData.js

    rf97c94 r3aa877  
    324324            else if (!this._key) this._value = null;
    325325            else if (this._key) {
    326                 var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    327                     .getService(Components.interfaces.nsISmtpService).smtpServers;
     326                var servers, smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
     327                    .getService(Components.interfaces.nsISmtpService);
     328                // check for new https://hg.mozilla.org/comm-central/rev/fab9e5145cd4 smtpService
     329                if (typeof(smtpService.servers) == "object") servers = smtpService.servers;
     330                else servers = smtpService.smtpServers;
     331
    328332                while (servers && servers.hasMoreElements()) {
    329333                    var server = servers.getNext();
     
    362366            this._value = "";
    363367            // if this worked we are having at least seamonkey 1.17
    364             accounts = getAccountsArray();
     368            let accounts = getAccountsArray();
    365369            for (let acc = 0; acc < accounts.length; acc++) {
    366370                let account = accounts[acc];
  • modules/vI_rdfDatasource.js

    rf97c94 r3aa877  
    473473       
    474474        for (var smtp in relevantSMTPs) {
    475             var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    476                 .getService(Components.interfaces.nsISmtpService).smtpServers;
     475            var servers, smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
     476                .getService(Components.interfaces.nsISmtpService);
     477            // check for new https://hg.mozilla.org/comm-central/rev/fab9e5145cd4 smtpService
     478            if (typeof(smtpService.servers) == "object") servers = smtpService.servers;
     479            else servers = smtpService.smtpServers;
     480
    477481            var found = false;
    478482            while (servers && servers.hasMoreElements()) {
     
    535539        }
    536540       
    537         var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    538             .getService(Components.interfaces.nsISmtpService).smtpServers;
     541        var servers, smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
     542            .getService(Components.interfaces.nsISmtpService);
     543        // check for new https://hg.mozilla.org/comm-central/rev/fab9e5145cd4 smtpService
     544        if (typeof(smtpService.servers) == "object") servers = smtpService.servers;
     545        else servers = smtpService.smtpServers;
     546
    539547        while (servers && servers.hasMoreElements()) {
    540548            var server = servers.getNext();
     
    10251033   
    10261034    _getMatchingSMTP : function(label, hostname, username) {
    1027         var servers = Components.classes["@mozilla.org/messengercompose/smtp;1"]
    1028             .getService(Components.interfaces.nsISmtpService).smtpServers;
     1035        var servers, smtpService = Components.classes["@mozilla.org/messengercompose/smtp;1"]
     1036            .getService(Components.interfaces.nsISmtpService);
     1037        // check for new https://hg.mozilla.org/comm-central/rev/fab9e5145cd4 smtpService
     1038        if (typeof(smtpService.servers) == "object") servers = smtpService.servers;
     1039        else servers = smtpService.smtpServers;
     1040
    10291041        while (servers && servers.hasMoreElements()) {
    10301042            var server = servers.getNext();
Note: See TracChangeset for help on using the changeset viewer.