Changeset bf505e


Ignore:
Timestamp:
Nov 15, 2011, 12:22:28 PM (9 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
d8da4b
Parents:
f17e5d3
Message:

cleanup debug messages

Location:
content
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/vI_rdfAccountMismatchDialog.xml

    rf17e5d3 rbf505e  
    155155    <method name="_addIdentities">
    156156        <body><![CDATA[
    157         MyLog.debug("## mismatchID-menupopup: _addIdentities.\n");
     157        MyLog.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addIdentities.\n");
    158158        var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
    159159            .getService(Components.interfaces.nsIMsgAccountManager);
     
    177177        <parameter name="server" />
    178178        <body><![CDATA[
    179             MyLog.debug("## mismatchID-menupopup: _addSmtp.\n");
     179            MyLog.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addSmtp.\n");
    180180            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
    181181            var menuitem = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
     
    190190    <method name="_addSmtpServers">
    191191        <body><![CDATA[
    192             MyLog.debug("## mismatchID-menupopup: _addSmtpServers.\n");
     192            MyLog.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addSmtpServers.\n");
    193193           
    194194            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
     
    209209    <constructor>
    210210        <![CDATA[       
    211         MyLog.debug("## mismatchID-menupopup: constructor.\n");
     211        MyLog.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: constructor.\n");
    212212        const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
    213213        this.appendChild(document.createElementNS(XUL_NS, "menuseparator")); // create a new XUL menuseparator
  • content/modules/plugins/conversation.js

    rf17e5d3 rbf505e  
    2929
    3030let _changeIdentityToSmartIdentity = function(identityData) {
    31   Log.debug("## changeIdentityToSmartIdentity\n");
     31  Log.debug("changeIdentityToSmartIdentity\n");
    3232 
    3333  if ( identityData.id.key != null ) {
    3434    currentParams.identity = AccountManager.getIdentity(identityData.id.key);
    35     Log.debug("## changed base identity to ", identityData.id.key);
     35    Log.debug("changed base identity to ", identityData.id.key);
    3636    virtualSenderNameElem.text(currentIdSenderName);
    3737  }
    3838  virtualIdInUse = !(identityData.isExistingIdentity(false));
    39   Log.debug("## changeIdentityToSmartIdentity virtualIdInUse=" + virtualIdInUse + "\n");
     39  Log.debug("changeIdentityToSmartIdentity virtualIdInUse=" + virtualIdInUse + "\n");
    4040  if (virtualIdInUse) {
    4141    currentIdentityData = identityData;
     
    7373      var existingIDIndex = localSmartIdentityCollection._foundExistingIdentity();
    7474      if (existingIDIndex) {
    75         Log.debug("## smartIdentity: found existing Identity, use without interaction.\n", existingIDIndex.key);
     75        Log.debug("smartIdentity: found existing Identity, use without interaction.\n", existingIDIndex.key);
    7676        changeIdentityToSmartIdentity(localSmartIdentityCollection._allIdentities, existingIDIndex.key);
    7777        return;
     
    9393  onMessageBeforeSendOrPopout: function(aAddress, aStatus, aPopout) {
    9494    let toAddrList = aAddress.to.concat(aAddress.cc);
    95     Log.debug("## onMessageBeforeSendOrPopup");
     95    Log.debug("onMessageBeforeSendOrPopup");
    9696   
    9797    if (virtualIdInUse) {
  • content/modules/vI_account.js

    rf17e5d3 rbf505e  
    4343            .getService(Components.interfaces.nsIMsgAccountManager);
    4444           
    45     Log.debug("\n## prepareSendMsg " + msgType + " " + Components.interfaces.nsIMsgCompDeliverMode.Now + "\n");
     45    Log.debug("\nprepareSendMsg " + msgType + " " + Components.interfaces.nsIMsgCompDeliverMode.Now + "\n");
    4646   
    4747    returnValue = {};
     
    6161            var returnValue = localeDatasourceAccess.storeVIdentityToAllRecipients(identityData, recipients)
    6262            if ( returnValue.update == "abort" || returnValue.update == "takeover" ) {
    63                 Log.debug("## prepareSendMsg: sending aborted\n");
     63                Log.debug("prepareSendMsg: sending aborted\n");
    6464                return returnValue;
    6565            }
    6666        }
    67         else Log.debug("## prepareSendMsg: storage deactivated\n");
     67        else Log.debug("prepareSendMsg: storage deactivated\n");
    6868    }
    6969    if (vid) {
     
    8080    var currentIdentityData = new vI.identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
    8181   
    82     Log.debug("\n## vI.identityData SendMessage Final Check\n");
    83     Log.debug("## vI.identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
    84     Log.debug("## vI.identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
     82    Log.debug("\nSendMessage Final Check\n");
     83    Log.debug("currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
     84    Log.debug("virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
    8585
    8686    if  (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
     
    9090    }
    9191    else {
    92         if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) Log.debug("\n## vI.identityData failed check for fullName.\n");
    93         if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) Log.debug("\n## vI.identityData failed check for email.\n");
    94         if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) Log.debug("\n## vI.identityData failed check for SMTP.\n");
     92        if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) Log.error("\nfailed check for fullName.\n");
     93        if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) Log.error("\nfailed check for email.\n");
     94        if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) Log.error("\nfailed check for SMTP.\n");
    9595        alert(stringBundle.getStringFromName("vident.genericSendMessage.error"));
    9696        return false
     
    140140        if (account._pref.getBoolPref("copySMIMESettings")) {
    141141            // SMIME settings
    142             Log.debug("## account: copy S/MIME settings\n")
     142            Log.debug("copy S/MIME settings\n")
    143143            account._copyUnicharAttribute("signing_cert_name");
    144144            account._copyUnicharAttribute("encryption_cert_name");
     
    148148        if (account._pref.getBoolPref("copyEnigmailSettings")) {
    149149            // pgp/enigmail settings
    150             Log.debug("## account: copy PGP settings\n")
     150            Log.debug("copy PGP settings\n")
    151151            account._copyBoolAttribute("pgpSignEncrypted");
    152152            account._copyBoolAttribute("pgpSignPlain");
     
    161161        if (account._pref.getBoolPref("copyAttachVCardSettings")) {
    162162            // attach vcard
    163             Log.debug("## account: copy VCard settings\n")
     163            Log.debug("copy VCard settings\n")
    164164            account._copyBoolAttribute("attachVCard");
    165165            account._copyCharAttribute("escapedVCard");
     
    185185
    186186    __cleanupDirectories : function() {
    187         Log.debug("## account: checking for leftover VirtualIdentity directories ")
     187        Log.debug("checking for leftover VirtualIdentity directories ")
    188188
    189189        var file = Components.classes["@mozilla.org/file/directory_service;1"]
     
    217217   
    218218    cleanupSystem : function() {
    219         Log.debug("## account: checking for leftover VirtualIdentity accounts ")
     219        Log.debug("checking for leftover VirtualIdentity accounts ")
    220220        for (var i=0; i < account._AccountManager.accounts.Count(); i++) {
    221221            var checkAccount = account._AccountManager.accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
     
    240240   
    241241    __removeAccount : function(checkAccount) {
    242         Log.debug("## account: __removeAccount\n")
     242        Log.debug("__removeAccount\n")
    243243        // in new (post 0.5.0) Virtual Identity accounts the incomingServer of the account
    244244        // points to an incoming server of a different account. Cause the internal
     
    256256       
    257257        var key = checkAccount.key;
    258         Log.debug("## account: removing account " + key + ".\n")
     258        Log.debug("removing account " + key + ".\n")
    259259        // remove the account
    260260        account._AccountManager.removeAccount(checkAccount);
     
    329329            account._account.defaultIdentity.smtpServerKey = baseIdentity.smtpServerKey;
    330330
    331         Log.debug("## account: Stored virtualIdentity (name "
     331        Log.debug("Stored virtualIdentity (name "
    332332            + account._account.defaultIdentity.fullName + " email "
    333333            + account._account.defaultIdentity.email + " smtp "
     
    345345            {
    346346                case "2"  :
    347                 Log.debug ("## account: preparing Fcc --- use Settings of Default Account\n");
     347                Log.debug ("preparing Fcc --- use Settings of Default Account\n");
    348348                account._account.defaultIdentity.doFcc = account._AccountManager.defaultAccount.defaultIdentity.doFcc;
    349349                account._account.defaultIdentity.fccFolder = account._AccountManager.defaultAccount.defaultIdentity.fccFolder;
     
    352352                break;
    353353                case "3"  :
    354                 Log.debug ("## account: preparing Fcc --- use Settings of Modified Account\n");
     354                Log.debug ("preparing Fcc --- use Settings of Modified Account\n");
    355355                account._account.defaultIdentity.doFcc = account._baseIdentity.doFcc;
    356356                account._account.defaultIdentity.fccFolder = account._baseIdentity.fccFolder;
     
    359359                break;
    360360                default  :
    361                 Log.debug ("## account: preparing Fcc --- use Virtual Identity Settings\n");
     361                Log.debug ("preparing Fcc --- use Virtual Identity Settings\n");
    362362                account._account.defaultIdentity.doFcc
    363363                    = account._pref.getBoolPref("doFcc");
     
    372372        }
    373373        else {
    374             dump ("## account: dont performing Fcc\n");
     374            dump ("dont performing Fcc\n");
    375375            account._account.defaultIdentity.doFcc = false;
    376376        }
    377         Log.debug("## account: Stored (doFcc " + account._account.defaultIdentity.doFcc + " fccFolder " +
     377        Log.debug("Stored (doFcc " + account._account.defaultIdentity.doFcc + " fccFolder " +
    378378            account._account.defaultIdentity.fccFolder + " fccFolderPickerMode " +
    379379            account._account.defaultIdentity.fccFolderPickerMode + "(" +
     
    385385        {
    386386            case "2"  :
    387             Log.debug ("## account: preparing Draft --- use Settings of Default Account\n");
     387            Log.debug ("preparing Draft --- use Settings of Default Account\n");
    388388            account._account.defaultIdentity.draftFolder = account._AccountManager.defaultAccount.defaultIdentity.draftFolder;
    389389            account._account.defaultIdentity.draftsFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.draftsFolderPickerMode;
    390390            break;
    391391            case "3"  :
    392             Log.debug ("## account: preparing Draft --- use Settings of Modified Account\n");
     392            Log.debug ("preparing Draft --- use Settings of Modified Account\n");
    393393            account._account.defaultIdentity.draftFolder = account._baseIdentity.draftFolder;
    394394            account._account.defaultIdentity.draftsFolderPickerMode = account._baseIdentity.draftsFolderPickerMode;
    395395            break;
    396396            default  :
    397             Log.debug ("## account: preparing Draft --- use Virtual Identity Settings\n");
     397            Log.debug ("preparing Draft --- use Virtual Identity Settings\n");
    398398            account._account.defaultIdentity.draftFolder
    399399                = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("draftFolder"));
     
    402402            break;
    403403        }
    404         Log.debug("## account: Stored (draftFolder " +
     404        Log.debug("Stored (draftFolder " +
    405405            account._account.defaultIdentity.draftFolder + " draftsFolderPickerMode " +
    406406            account._account.defaultIdentity.draftsFolderPickerMode + "(" +
     
    412412        {
    413413            case "2"  :
    414             Log.debug ("## account: preparing Templates --- use Settings of Default Account\n");
     414            Log.debug ("preparing Templates --- use Settings of Default Account\n");
    415415            account._account.defaultIdentity.stationeryFolder = account._AccountManager.defaultAccount.defaultIdentity.stationeryFolder;
    416416            account._account.defaultIdentity.tmplFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.tmplFolderPickerMode;
    417417            break;
    418418            case "3"  :
    419             Log.debug ("## account: preparing Templates --- use Settings of Modified Account\n");
     419            Log.debug ("preparing Templates --- use Settings of Modified Account\n");
    420420            account._account.defaultIdentity.stationeryFolder = account._baseIdentity.stationeryFolder;
    421421            account._account.defaultIdentity.tmplFolderPickerMode = account._baseIdentity.tmplFolderPickerMode;
    422422            break;
    423423            default  :
    424             Log.debug ("## account: preparing Templates --- use Virtual Identity Settings\n");
     424            Log.debug ("preparing Templates --- use Virtual Identity Settings\n");
    425425            account._account.defaultIdentity.stationeryFolder
    426426                = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("stationeryFolder"));
     
    429429            break;
    430430        }
    431         Log.debug("## account: Stored (stationeryFolder " +
     431        Log.debug("Stored (stationeryFolder " +
    432432            account._account.defaultIdentity.stationeryFolder + " tmplFolderPickerMode " +
    433433            account._account.defaultIdentity.tmplFolderPickerMode + "(" +
  • content/modules/vI_identityData.js

    rf17e5d3 rbf505e  
    7474            this._fullName += RegExp.leftContext + RegExp.rightContext;
    7575            this._email = RegExp.lastMatch;
    76 //          Log.debug("## identityData: parseEmail _fullName = '" + this._fullName + "'\n");
    77 //          Log.debug("## identityData: parseEmail _email =    '" + this._email + "'\n");
     76//          Log.debug("parseEmail _fullName = '" + this._fullName + "'\n");
     77//          Log.debug("parseEmail _email =    '" + this._email + "'\n");
    7878        }
    7979        this._emailParsed = true;
     
    8686
    8787    cleanName : function(fullName) {
    88 //      Log.debug("## identityData: cleanName init '" + fullName + "'\n");
     88//      Log.debug("cleanName init '" + fullName + "'\n");
    8989        var _fullName = fullName.replace(/^\s+|\s+$/g,"");
    9090        if (_fullName.search(/^\".+\"$|^'.+'$/g) != -1) {
    9191            _fullName = this.cleanName(_fullName.replace(/^\"(.+)\"$|^'(.+)'$/g,"$1$2"));
    9292        }
    93 //      Log.debug("## identityData: cleanName done '" + _fullName + "'\n");
     93//      Log.debug("cleanName done '" + _fullName + "'\n");
    9494        return _fullName;
    9595    },
     
    136136    // dependent on MsgComposeCommands, should/will only be called in ComposeDialog
    137137    isExistingIdentity : function(ignoreFullNameWhileComparing) {
    138         Log.debug("## identityData: isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n");
    139 //      Log.debug("## identityData base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n");
     138        Log.debug("isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n");
     139//      Log.debug("base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n");
    140140
    141141        var ignoreFullNameMatchKey = null;
     
    147147            for (let j = 0; j < account.identities.Count(); j++) {
    148148                var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
    149 //              Log.debug("## identityData comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'\n");
     149//              Log.debug("comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'\n");
    150150                var email = this.email?this.email:"";               // might be null if no identity is set
    151151                var idEmail = identity.email?identity.email:""; // might be null if no identity is set
     
    154154                        // if fullName matches, than this is a final match
    155155                        if ( this.fullName.toLowerCase() == identity.fullName.toLowerCase() ) {
    156                             Log.debug("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'\n");
     156                            Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'\n");
    157157                            return identity.key; // return key and stop searching
    158158                        }
     
    164164
    165165        if ( ignoreFullNameWhileComparing && ignoreFullNameMatchKey ) {
    166             Log.debug("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n");
     166            Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n");
    167167            return  ignoreFullNameMatchKey;
    168168        }
    169169
    170         Log.debug("## identityData: isExistingIdentity: " + this.combinedName + " not found\n");
     170        Log.debug("isExistingIdentity: " + this.combinedName + " not found\n");
    171171        return null;
    172172    },
     
    243243
    244244    dropIdentity : function(index) {
    245         Log.debug("## identityCollection:   dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n");
     245        Log.debug("dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n");
    246246        while (index < (this.number - 1)) { this.identityDataCollection[index] = this.identityDataCollection[++index]; };
    247247        this.identityDataCollection[--this.number] = null;
     
    258258                if (this.identityDataCollection[index].fullName == "" && identityData.fullName != "") {
    259259                    this.identityDataCollection[index].fullName = identityData.fullName;
    260                     Log.debug("## identityCollection:   added fullName '" + identityData.fullName
     260                    Log.debug("added fullName '" + identityData.fullName
    261261                        + "' to stored email '" + this.identityDataCollection[index].email +"'\n")
    262262                }
     
    267267                    this.identityDataCollection[index].smtp.key = identityData.smtp.key;
    268268                    this.identityDataCollection[index].extras = identityData.extras;
    269                     Log.debug("## identityCollection:   added id '" + identityData.id.value
     269                    Log.debug("added id '" + identityData.id.value
    270270                        + "' smtp '" + identityData.smtp.value + "' (+extras) to stored email '" + this.identityDataCollection[index].email +"'\n")
    271271                }
     
    273273            }
    274274        }
    275         Log.debug("## identityCollection:   add new address to result: " + identityData.combinedName + "\n")
     275        Log.debug("add new address to result: " + identityData.combinedName + "\n")
    276276        this.identityDataCollection[index] = identityData;
    277277        this.number = index + 1;
  • content/modules/vI_rdfDatasource.js

    rf17e5d3 rbf505e  
    9494
    9595    init: function() {
    96 //         Log.debug("## rdfDatasource init.\n");
     96//         Log.debug("init.\n");
    9797
    9898        this._openRdfDataSource();
     
    105105           
    106106//         this.refreshAccountInfo();
    107 //         Log.debug("## rdfDatasource init done.\n");
     107//         Log.debug("init done.\n");
    108108    },
    109109   
     
    123123        var fileURI = protoHandler.newFileURI(newFile);
    124124
    125         Log.debug("## rdfDatasource init: read rdf from '" + fileURI.spec + "'\n");
     125        Log.debug("init: read rdf from '" + fileURI.spec + "'\n");
    126126
    127127        this._rdfDataSource =
    128128            this._rdfService.GetDataSourceBlocking(fileURI.spec);
    129129           
    130 //         Log.debug("## rdfDatasource read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");
     130//         Log.debug("read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");
    131131    },
    132132   
     
    348348   
    349349    cleanAccountInfo : function() {
    350         Log.debug("## rdfDatasource: cleanAccountInfo\n");
     350        Log.debug("cleanAccountInfo\n");
    351351       
    352352        var enumerator = this._identityContainer.GetElements();
     
    389389   
    390390    searchIdentityMismatch : function() {
    391         Log.debug("## rdfDatasource: searchIdentityMismatch");
     391        Log.debug("searchIdentityMismatch");
    392392
    393393        var relevantIDs = this.getRelevantIDs();
     
    432432        var keyField = (type == "identity")?"id":"smtp" // field to change is 'id' or 'smtp' dependent on type
    433433        for (var i = 0; i < mismatchItems.length; i++) {
    434             Log.debug("## rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
     434            Log.debug("repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
    435435            // search relevant Identities
    436436            for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
     
    468468   
    469469    searchSmtpMismatch : function() {
    470         Log.debug("## rdfDatasource: searchSmtpMismatch");
     470        Log.debug("searchSmtpMismatch");
    471471
    472472        var relevantSMTPs = this.getRelevantSMTPs();
     
    505505
    506506    storeAccountInfo : function() {
    507         Log.debug("## rdfDatasource: storeAccounts\n");
     507        Log.debug("storeAccounts\n");
    508508
    509509        var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
     
    513513            for (let j = 0; j < account.identities.Count(); j++) {
    514514                var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
    515 //                 Log.debug("## rdfDatasource: storeAccounts identity store id " + identity.key + "\n");
     515//                 Log.debug("storeAccounts identity store id " + identity.key + "\n");
    516516
    517517                var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + identity.key);
     
    527527       
    528528        function storeSmtp(server, parent) {
    529 //             Log.debug("## rdfDatasource: storeAccounts smtp store id " + server.key + "\n");
     529//             Log.debug("storeAccounts smtp store id " + server.key + "\n");
    530530            var resource = parent._rdfService.GetResource(parent._rdfNS + parent._rdfNSSMTPservers + "/" + server.key);
    531531            parent._setRDFValue(resource, "label", (server.description?server.description:server.hostname));
     
    544544        }
    545545
    546 //         Log.debug("## rdfDatasource: storeAccounts done\n");
     546//         Log.debug("storeAccounts done\n");
    547547    },
    548548
     
    569569        if (!this._rdfDataSource) return null;
    570570        if (!recDescription) {
    571             Log.debug("## rdfDatasource: _getRDFResourceForVIdentity: no Recipient given.\n");
     571            Log.debug("_getRDFResourceForVIdentity: no Recipient given.\n");
    572572            return null;
    573573        }
     
    585585   
    586586    removeVIdentityFromRDF : function (resource, recType) {
    587 //      Log.debug("## rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
     587//      Log.debug("removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
    588588        this._unsetRDFValue(resource, "email", this._getRDFValue(resource, "email"))
    589589        this._unsetRDFValue(resource, "fullName", this._getRDFValue(resource, "fullName"))
     
    598598   
    599599    _unsetRDFValue : function (resource, field, value) {
    600 //      Log.debug("## rdfDatasource _unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource + "\n");
     600//      Log.debug("_unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource + "\n");
    601601        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
    602602        var name = this._rdfService.GetLiteral(value?value:"");
     
    611611    // this will be used from rdfDataTree to get all RDF values, callFunction is vI.rdfDataTreeCollection.__addNewDatum
    612612    readAllEntriesFromRDF : function (addNewDatum, treeType, idData) {
    613 //      Log.debug("## rdfDatasource: readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
     613//      Log.debug("readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
    614614        var enumerator = this.getContainer(treeType).GetElements();
    615615        while (enumerator && enumerator.hasMoreElements()) {
     
    632632        if (recipientType == "addr_newsgroups") return { recDesc : recipient, recType : "newsgroup" }
    633633        else if (this.__isMailingList(recipient)) {
    634             Log.debug("## __getDescriptionAndType: '" + recipient + "' is MailList\n");
     634            Log.debug("__getDescriptionAndType: '" + recipient + "' is MailList\n");
    635635            return { recDesc : this.__getMailListName(recipient), recType : "maillist" }
    636636        }
    637637        else {
    638             Log.debug("## __getDescriptionAndType: '" + recipient + "' is no MailList\n");
     638            Log.debug("__getDescriptionAndType: '" + recipient + "' is no MailList\n");
    639639            var localIdentityData = new vI.identityData(recipient, null, null, null, null, null, null);
    640640            return { recDesc : localIdentityData.combinedName, recType : "email" }
     
    678678    findMatchingFilter : function (recipient, recipientType) {
    679679        var recDescription = this.__getDescriptionAndType(recipient, recipientType).recDesc;
    680         Log.debug("## rdfDatasource: findMatchingFilter for " + recDescription + ".\n");
     680        Log.debug("findMatchingFilter for " + recDescription + ".\n");
    681681        var enumerator = this._filterContainer.GetElements();
    682682        while (enumerator && enumerator.hasMoreElements()) {
     
    690690            if (filter == "") continue;
    691691            if (/^\/(.*)\/$/.exec(filter))
    692                 { Log.debug("## rdfDatasource: findMatchingFilter with RegExp '"
     692                { Log.debug("findMatchingFilter with RegExp '"
    693693                    + filter.replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
    694             else    { Log.debug("## rdfDatasource: findMatchingFilter, compare with '"
     694            else    { Log.debug("findMatchingFilter, compare with '"
    695695                    + filter + "'\n"); recentfilterType = filterType.StrCmp; }
    696696           
     
    699699                    try {   /^\/(.*)\/$/.exec(filter);
    700700                        if (recDescription.match(new RegExp(RegExp.$1,"i"))) {
    701                             Log.debug("## rdfDatasource: findMatchingFilter found stored data.\n");
     701                            Log.debug("findMatchingFilter found stored data.\n");
    702702                            return this._readVIdentityFromRDF(resource);
    703703                        }
     
    706706                case filterType.StrCmp:
    707707                    if (recDescription.toLowerCase().indexOf(filter.toLowerCase()) != -1) {
    708                         Log.debug("## rdfDatasource: findMatchingFilter found stored data.\n");
     708                        Log.debug("findMatchingFilter found stored data.\n");
    709709                        return this._readVIdentityFromRDF(resource);
    710710                    }
     
    712712            }
    713713        }
    714         Log.debug("## rdfDatasource: findMatchingFilter no match found.\n");
     714        Log.debug("findMatchingFilter no match found.\n");
    715715        return null;
    716716    },
     
    723723        if (!this._rdfDataSource.hasArcOut(resource, email)) {
    724724            // no data available --> give up.
    725             Log.debug("## rdfDatasource: readVIdentityFromRDF no data found.\n");
     725            Log.debug("readVIdentityFromRDF no data found.\n");
    726726            return null;
    727727        }
    728         Log.debug("## rdfDatasource: readVIdentityFromRDF found stored data.\n");
     728        Log.debug("readVIdentityFromRDF found stored data.\n");
    729729       
    730730        return this._readVIdentityFromRDF(resource);
     
    738738        if (!smtp) smtp = vI.NO_SMTP_TAG;
    739739       
    740         Log.debug("## rdfDatasource: email='" + email +
     740        Log.debug("email='" + email +
    741741            "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
    742742       
    743743        var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
    744744        var extras_status = (typeof(vI.storageExtras)=='function')?extras.status():" not used";
    745         Log.debug("## rdfDatasource: extras:" + extras_status + "\n");
     745        Log.debug("extras:" + extras_status + "\n");
    746746       
    747747        var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
     
    750750
    751751    _getRDFValue : function (resource, field) {
    752 //         Log.debug("## rdfDatasource _getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
     752//         Log.debug("_getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
    753753        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
    754754        var target = this._rdfDataSource.GetTarget(resource, predicate, true);
     
    775775
    776776    updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, storeSMTP, prevRecDescription, prevRecType) {
    777 //         Log.debug("## rdfDatasource (" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n");
     777//         Log.debug("(" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n");
    778778       
    779779//      if (!localIdentityData.email) {
    780 //          Log.debug("## rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
     780//          Log.debug("updateRDF: no Sender-email for Recipient, aborting.\n");
    781781//          return;
    782782//      }
     
    788788        var resource = this._getRDFResourceForVIdentity(prevRecDescription, prevRecType);
    789789        if (!resource) return;
    790 //      Log.debug("## rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
     790//      Log.debug("updateRDF " + resource.ValueUTF8 + ".\n");
    791791       
    792792        var position = this.getContainer(recType).IndexOf(resource); // check for index in new recType
     
    807807        if (localIdentityData.extras) localIdentityData.extras.loopForRDF(this, resource, "set");
    808808       
    809         Log.debug("## rdfDatasource: updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");
     809        Log.debug("updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");
    810810        if (position != -1) this.getContainer(recType).InsertElementAt(resource, position, true);
    811811        else this.getContainer(recType).AppendElement(resource);
     
    813813
    814814    _setRDFValue : function (resource, field, value) {
    815 //      Log.debug("## rdfDatasource: _setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
     815//      Log.debug("_setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
    816816        if (!value) return value; // return if some value was not set.
    817 //      Log.debug("## rdfDatasource _setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");
     817//      Log.debug("_setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");
    818818        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
    819819        var name = this._rdfService.GetLiteral(value);
     
    831831        observe : function(subject, topic, data) {
    832832            if (topic == "am-smtpChanges" || topic == "am-acceptChanges") {
    833                 Log.debug("## rdfDatasource: account/smtp changes observed\n");
     833                Log.debug("account/smtp changes observed\n");
    834834                this.searchIdentityMismatch();
    835835                this.searchSmtpMismatch();
     
    838838        },
    839839        register : function() {
    840             Log.debug("## rdfDatasource: register AccountManagerObserver\n");
     840            Log.debug("register AccountManagerObserver\n");
    841841            var obsService = Components.classes["@mozilla.org/observer-service;1"].
    842842                getService(Components.interfaces.nsIObserverService)
     
    876876        var localIdentities = new vI.identityCollection();
    877877        localIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipientName, recipientType));
    878         if (localIdentities.number == 1) Log.debug("## rdfDatasourceAccess: using data from direct match\n");
     878        if (localIdentities.number == 1) Log.debug("using data from direct match\n");
    879879        localIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipientName, recipientType));
    880880       
    881881        var returnValue = {}; returnValue.identityCollection = localIdentities; returnValue.result = "drop";
    882882        if (localIdentities.number == 0) {
    883             Log.debug("## rdfDatasourceAccess: updateVIdentityFromStorage no usable Storage-Data found.\n");
     883            Log.debug("updateVIdentityFromStorage no usable Storage-Data found.\n");
    884884        }
    885885        else {
    886             Log.debug("## rdfDatasourceAccess: compare with current Identity\n");
     886            Log.debug("compare with current Identity\n");
    887887            if (this._pref.getBoolPref("storage_getOneOnly") &&     // if requested to retrieve only storageID for first recipient entered
    888888                isNotFirstInputElement &&                           // and it is now not the first recipient entered
     
    893893            // only update fields if new Identity is different than old one.
    894894            else {
    895                 Log.debug("## rdfDatasourceAccess: updateVIdentityFromStorage check if storage-data matches current Identity.\n");
     895                Log.debug("updateVIdentityFromStorage check if storage-data matches current Identity.\n");
    896896                var compResult = localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, true);
    897897                if (!compResult.equal) {
     
    914914        var multipleRecipients = (recipients.length > 1);
    915915        var dontUpdateMultipleNoEqual = (this._pref.getBoolPref("storage_dont_update_multiple") && multipleRecipients)
    916         Log.debug("## rdfDatasource: storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
     916        Log.debug("storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
    917917       
    918918        for (var j = 0; j < recipients.length; j++) {
     
    925925    getVIdentityFromAllRecipients : function(allIdentities, recipients) {
    926926        if (!this._pref.getBoolPref("storage"))
    927             { Log.debug("## storage: Storage deactivated\n"); return; }
     927            { Log.debug("Storage deactivated\n"); return; }
    928928        var initnumber = allIdentities.number;
    929929        for (var j = 0; j < recipients.length; j++) {
     
    931931            allIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipients[j].recipient, recipients[j].recipientType));
    932932        }
    933         Log.debug("## storage: found " + (allIdentities.number-initnumber) + " address(es)\n")
     933        Log.debug("found " + (allIdentities.number-initnumber) + " address(es)\n")
    934934    },
    935935
    936936    __updateStorageFromVIdentity : function(identityData, recipient, recipientType, dontUpdateMultipleNoEqual) {
    937         Log.debug("## rdfDatasource: __updateStorageFromVIdentity.\n")
     937        Log.debug("__updateStorageFromVIdentity.\n")
    938938        var storageDataByType = this._rdfDataSource.readVIdentityFromRDF(recipient, recipientType);
    939939        var storageDataByFilter = this._rdfDataSource.findMatchingFilter(recipient, recipientType);
     
    948948        if (    (!storageDataByType && !storageDataByFilterEqual) ||
    949949            (!storageDataByTypeEqual && !storageDataByFilterEqual && !dontUpdateMultipleNoEqual) ) {
    950             Log.debug("## storage: __updateStorageFromVIdentity updating\n")
     950            Log.debug("__updateStorageFromVIdentity updating\n")
    951951            if (storageDataByType && !storageDataByTypeEqual && this._pref.getBoolPref("storage_warn_update")) {
    952                 Log.debug("## storage: __updateStorageFromVIdentity overwrite warning\n");
     952                Log.debug("__updateStorageFromVIdentity overwrite warning\n");
    953953                doUpdate = this.__askWarning(this.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
    954954            }
     
    10361036            values.id = values.id?values.id:"import_" + id
    10371037            relevantIDs[id] = values;
    1038             Log.debug("## rdfDatasourceImporter import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n");
     1038            Log.debug("import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n");
    10391039        }
    10401040        return relevantIDs;
     
    10681068            values.smtp = values.smtp?values.smtp:"import_" + smtp;
    10691069            relevantSMTPs[smtp] = values;
    1070             Log.debug("## rdfDatasourceImporter import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n");
     1070            Log.debug("import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n");
    10711071        }
    10721072        return relevantSMTPs;
     
    10981098       
    10991099        if (filePicker.show() == Components.interfaces.nsIFilePicker.returnOK) {
    1100             Log.debug("\n## rdfDatasourceImporter IMPORT\n## rdfDatasourceImporter import: preparation:\n");
     1100            Log.debug("\nIMPORT\nimport: preparation:\n");
    11011101           
    11021102            var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"]
     
    11081108            filePicker.file.copyTo(importRdfDataFile.parent,importRdfDataFile.leafName);
    11091109
    1110             Log.debug("## rdfDatasourceImporter import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n");
     1110            Log.debug("import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n");
    11111111           
    11121112            // init Datasources
     
    11171117            var relevantSMTPs = this._translateRelevantSMTPs();
    11181118           
    1119             Log.debug("## rdfDatasourceImporter import: preparation done.\n");
    1120             Log.debug("## rdfDatasourceImporter import: starting import:\n");
     1119            Log.debug("import: preparation done.\n");
     1120            Log.debug("import: starting import:\n");
    11211121
    11221122            for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
     
    11251125                var container = this._rdfImportDataSource.getContainer(treeType)
    11261126                if (container.GetCount() == 0) continue;
    1127                 Log.debug("## rdfDatasourceImporter importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n");
     1127                Log.debug("importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n");
    11281128                var enumerator = container.GetElements();
    11291129                // re-initialize dataSource to point rdfService to the right Resources
     
    11331133                    var resource = enumerator.getNext(); count += 1;
    11341134                    resource.QueryInterface(Components.interfaces.nsIRDFResource);
    1135                     Log.debug("## " + count + " ");
     1135                    Log.debug(" " + count + " ");
    11361136                    var name = this._rdfImportDataSource._getRDFValue(resource, "name")
    11371137                    var email = this._rdfImportDataSource._getRDFValue(resource, "email")
     
    11511151            }
    11521152           
    1153             Log.debug("## rdfDatasourceImporter import: removing temporary file " + importRdfDataFile.path + ".\n");
     1153            Log.debug("import: removing temporary file " + importRdfDataFile.path + ".\n");
    11541154            this._rdfImportDataSource = null; importRdfDataFile.remove(false);
    1155             Log.debug("## rdfDatasourceImporter import: import done.\n");
    1156            
    1157             Log.debug("## rdfDatasourceImporter import: cleaning ID/SMTP storages:\n");
     1155            Log.debug("import: import done.\n");
     1156           
     1157            Log.debug("import: cleaning ID/SMTP storages:\n");
    11581158            this._rdfDataSource = new rdfDatasource(this._rdfFileName, true);
    11591159           
     
    11661166            this._rdfDataSource.clean();
    11671167            this._rdfDataSource = null;
    1168             Log.debug("## rdfDatasourceImporter import: cleaning ID/SMTP storages done.\n");
    1169             Log.debug("## rdfDatasourceImporter IMPORT DONE.\n");
     1168            Log.debug("import: cleaning ID/SMTP storages done.\n");
     1169            Log.debug("IMPORT DONE.\n");
    11701170        }
    11711171    }
  • content/modules/vI_smartIdentityCollection.js

    rf17e5d3 rbf505e  
    3131
    3232function smartIdentityCollection(msgHdr, preseletedID, currentIDisVID, newsgroup, recipients) {
    33     dump("## smartIdentityCollection: constructor\n");
     33    dump("constructor\n");
    3434    this._IDisVID = currentIDisVID;
    3535    this._preselectedID = preseletedID;
     
    4040    this._rdfDatasourceAccess = new vI.rdfDatasourceAccess();
    4141    this._allIdentities = new vI.identityCollection();
    42     dump("## smartIdentityCollection: constructor done \n");
     42    dump("constructor done \n");
    4343};
    4444
     
    6565    // this function adds a timestamp to the current sender
    6666    __autoTimestamp : function() {
    67         Log.debug("## smartIdentity: __autoTimestamp()\n");
     67        Log.debug("__autoTimestamp()\n");
    6868        if (this._IDisVID) {
    69             Log.debug("## smartIdentity: Virtual Identity in use, aborting\n");
     69            Log.debug("Virtual Identity in use, aborting\n");
    7070            return;
    7171        }
     
    7575        var domain = current_email[1];
    7676       
    77         Log.debug("## smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n");
     77        Log.debug("current email: " + current_email[0] + "@" + current_email[1] + "\n");
    7878       
    7979        var autoString = this._pref.getCharPref("autoString");
     
    8787       
    8888        var new_email = autoString.replace(/%l/g, localpart).replace(/%d/g, domain).replace(/%t/g,dateString);
    89         Log.debug("## smartIdentity: new email: " + new_email + "\n");
     89        Log.debug("new email: " + new_email + "\n");
    9090
    9191        var newIdentity = new vI.identityData(new_email,
     
    9797   
    9898    __ignoreID : function() {
    99         Log.debug("## smartIdentity: checking " + this._pref.getCharPref("idSelection_ignoreIDs") + " against " + this._preselectedID.key + "\n")
     99        Log.debug("checking " + this._pref.getCharPref("idSelection_ignoreIDs") + " against " + this._preselectedID.key + "\n")
    100100        // check if usage if virtual Identities should be used at all for the currently selected ID
    101101        if (this._pref.getCharPref("idSelection_ignoreIDs").indexOf(":" + this._preselectedID.key + ":") != -1) {
    102             Log.debug("## smartIdentity: not using virtual Identites for ID " + this._preselectedID.key + "\n");
     102            Log.debug("not using virtual Identites for ID " + this._preselectedID.key + "\n");
    103103            return true;
    104104        }
     
    107107   
    108108    NewMail : function() {
    109         Log.debug("## smartIdentity: NewMail()\n");
     109        Log.debug("NewMail()\n");
    110110        if (this.__ignoreID()) return;
    111111        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
     
    121121                // reorder list of Identities to prefer it on autoselect
    122122                // has to be done before Identities are added to the Menu
    123                 Log.debug("## smartIdentity: found existing Identity, reorder to prefer this one.\n");
     123                Log.debug("found existing Identity, reorder to prefer this one.\n");
    124124                var firstIdentity = this._allIdentities.identityDataCollection[index];
    125125                for (var i = index; index > 0; index--) {
     
    134134   
    135135    ReplyOnSent : function() {
    136         Log.debug("## smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");
     136        Log.debug("ReplyOnSent() (rules like SmartDraft)\n");
    137137        this.__SmartDraftOrReplyOnSent();
    138138        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
     
    140140
    141141    Draft : function() {
    142         Log.debug("## smartIdentity: Draft()\n");
     142        Log.debug("Draft()\n");
    143143       
    144144        this.__SmartDraftOrReplyOnSent();
     
    159159    __SmartDraftOrReplyOnSent : function() {
    160160        if (!this._pref.getBoolPref("smart_draft"))
    161             { Log.debug("## smartIdentity: SmartDraft deactivated\n"); return; }
    162 
    163         Log.debug("## smartIdentity: __SmartDraftOrReplyOnSent()\n");
     161            { Log.debug("SmartDraft deactivated\n"); return; }
     162
     163        Log.debug("__SmartDraftOrReplyOnSent()\n");
    164164
    165165        if (this._msgHdr) {
    166166            this.__parseHeadersWithArray(this._msgHdr.author, this._allIdentities)
    167             Log.debug("## smartIdentity: sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'\n");
    168         }
    169         else Log.debug("## smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
     167            Log.debug("sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'\n");
     168        }
     169        else Log.debug("__SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
    170170    },
    171171   
     
    181181            var recentfilterType; var skipRegExp = false;
    182182            if (filterList.length <= 1 && filterList[0] == "")
    183                 { Log.debug("## smartIdentity: no filters configured\n"); recentfilterType = filterType.None; }
     183                { Log.debug("no filters configured\n"); recentfilterType = filterType.None; }
    184184            else if (/^[+-]?\/(.*)\/$/.exec(filterList[i]))
    185                 { Log.debug("## smartIdentity: filter emails with RegExp '"
     185                { Log.debug("filter emails with RegExp '"
    186186                    + filterList[i].replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
    187             else    { Log.debug("## smartIdentity: filter emails, compare with '"
     187            else    { Log.debug("filter emails, compare with '"
    188188                    + filterList[i] + "'\n"); recentfilterType = filterType.StrCmp; }
    189189            for (var j = 0; j < this._allIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in
     
    240240            // if mailing-list ignore to-header (usually the mailing list address)
    241241            if (replyHeaderNameToRead == "to" && this._msgHdr.getStringProperty("vI_list-id")) {
    242                 Log.debug("## smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n");
     242                Log.debug("header 'list-id' found (mailinglist), skipping header 'to'\n");
    243243                continue;
    244244            }
     
    250250                 .getMostRecentWindow("mail:3pane");
    251251           
    252             Log.debug("## smartIdentity: found stored header '" +
     252            Log.debug("found stored header '" +
    253253                replyHeaderNameToRead + "': '" + window3pane.virtualIdentityExtension.storedHeaders["vI_" + replyHeaderNameToRead] + "'\n");*/
    254254           
    255             Log.debug("## smartIdentity: reading header '" +
     255            Log.debug("reading header '" +
    256256                replyHeaderNameToRead + "': '" + value + "'\n");
    257257           
     
    264264                // if there is no email than it makes no sense to use it as a sender
    265265                if (!splitted.identityDataCollection[i].email.match(/^.*@.*$/)) {
    266                     Log.debug("## smartIdentity:   skipping '" +
     266                    Log.debug("  skipping '" +
    267267                    splitted.identityDataCollection[i].email + "', no email\n")
    268268                    continue;
     
    273273                this._allIdentities.addWithoutDuplicates(splitted.identityDataCollection[i]);
    274274
    275                 Log.debug("## smartIdentity:   found '" +
     275                Log.debug("  found '" +
    276276                    splitted.identityDataCollection[i].combinedName + "'\n")
    277277            }
     
    280280   
    281281    Reply : function() {
    282         Log.debug("## smartIdentity: Reply()\n");
     282        Log.debug("Reply()\n");
    283283
    284284        if (this._msgHdr && this._newsgroup && !this._msgHdr.getStringProperty("vI_content_base")) {
     
    294294            if (this._pref.getBoolPref("smart_detectByReceivedHeader")) {
    295295                if (!this._msgHdr.getStringProperty("vI_received")) { // mail was not received
    296                     Log.debug("## smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n");
     296                    Log.debug("reply on non-received (sent?) mail. Using SmartDraft. \n");
    297297                    this.ReplyOnSent();
    298298                    return;
     
    305305
    306306                if (this._msgHdr && (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_SENTMAIL)) {
    307                     Log.debug("## smartIdentity: reply from Sent folder.");
     307                    Log.debug("reply from Sent folder.");
    308308                    if (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_INBOX)
    309309                        Log.debug(" Folder is INBOX, assuming Reply-Case. \n");
     
    324324        if (storageIdentities.number == 0 || !this._pref.getBoolPref("idSelection_storage_ignore_smart_reply"))
    325325            this.__SmartReply();
    326         else Log.debug("## smartIdentity: SmartReply skipped, Identities in Storage found.\n");
     326        else Log.debug("SmartReply skipped, Identities in Storage found.\n");
    327327
    328328        // merge SmartReply-Identities and Storage-Identites
     
    335335        }
    336336       
    337         Log.debug("## smartIdentity: merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left\n")
     337        Log.debug("merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left\n")
    338338    },
    339339   
     
    341341    __SmartReply : function() {
    342342        if (!this._pref.getBoolPref("smart_reply"))
    343             { Log.debug("## smartIdentity: SmartReply deactivated\n"); return; }
     343            { Log.debug("SmartReply deactivated\n"); return; }
    344344        if (this._newsgroup && !this._pref.getBoolPref("smart_reply_for_newsgroups")) {
    345             Log.debug("## smartIdentity: SmartReply, answering to a newsgroup, aborting\n");
     345            Log.debug("SmartReply, answering to a newsgroup, aborting\n");
    346346            return;
    347347        }
    348348
    349         Log.debug("## smartIdentity: __SmartReply()\n");
    350         Log.debug("## smartIdentity: ----------------------------------------------------------\n")
     349        Log.debug("__SmartReply()\n");
     350        Log.debug("----------------------------------------------------------\n")
    351351        if (this._msgHdr) {
    352352            /* first step: collect addresses */
    353353            this.__smartReplyCollectAddresses();
    354             Log.debug("## smartIdentity: " + this._allIdentities.number + " address(es) after parsing, before filtering\n")
     354            Log.debug("" + this._allIdentities.number + " address(es) after parsing, before filtering\n")
    355355           
    356356            /* second step: filter (and sort) addresses */
    357357            this.__filterAddresses();
    358358           
    359             Log.debug("## smartIdentity: filtering done, " + this._allIdentities.number + " address(es) left\n")
     359            Log.debug("filtering done, " + this._allIdentities.number + " address(es) left\n")
    360360           
    361361            /* set default FullName */
     
    365365                    if (this._allIdentities.identityDataCollection[index].fullName == "") {
    366366                        this._allIdentities.identityDataCollection[index].fullName = smart_reply_defaultFullName
    367                         Log.debug("## smartIdentity: added default FullName '" +
     367                        Log.debug("added default FullName '" +
    368368                            smart_reply_defaultFullName + "' to '" + this._allIdentities.identityDataCollection[index].email + "'\n")
    369369                    }
     
    375375            /* will not be added to the menu but probably choosen with __smartIdentitySelection     */
    376376            if (this._pref.getBoolPref("smart_reply_ignoreFullName")) {
    377                 Log.debug("## smartIdentity: compare with existing Identities (ignoring FullNames).\n")
     377                Log.debug("compare with existing Identities (ignoring FullNames).\n")
    378378           
    379379                for (var index = 0; index < this._allIdentities.number; index++) {
     
    382382                        var newFullName = gAccountManager.getIdentity(idKey).fullName;
    383383                        this._allIdentities.identityDataCollection[index].fullName = newFullName;
    384                         Log.debug("## smartIdentity: replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
     384                        Log.debug("replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
    385385                    }
    386386                }
    387387            }
    388388        }
    389         else Log.debug("## smartIdentity: SmartReply skipped. No Header-information found.\n");
    390        
    391         Log.debug("## smartIdentity: ----------------------------------------------------------\n")
     389        else Log.debug("SmartReply skipped. No Header-information found.\n");
     390       
     391        Log.debug("----------------------------------------------------------\n")
    392392    },
    393393   
  • content/prefDialog/vI_prefDialog.xml

    rf17e5d3 rbf505e  
    3434        <![CDATA[
    3535        with (virtualIdentityExtension.LIB) {
    36         MyLog.debug("## identitySelector: constructor\n");
     36        MyLog.debug("prefDialog.xml identitySelector: constructor\n");
    3737        var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
    3838            .getService(Components.interfaces.nsIMsgAccountManager);
     
    6262        <setter><![CDATA[
    6363        with (virtualIdentityExtension.LIB) {
    64         MyLog.debug("## identitySelector: setting value to '" + val + "'\n");
     64        MyLog.debug("prefDialog.xml identitySelector: setting value to '" + val + "'\n");
    6565        var listItems = this.childNodes;
    6666        for (var index = 0; index < listItems.length; index++) {
    6767            var key = listItems[index].getAttribute("value");
    6868            listItems[index].checked = (val.indexOf(":" + key + ":") == -1);
    69             MyLog.debug("## identitySelector: setting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n")
     69            MyLog.debug("prefDialog.xml identitySelector: setting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n")
    7070        }
    7171        this._value = val;
     
    7474        <getter><![CDATA[
    7575        with (virtualIdentityExtension.LIB) {
    76         MyLog.debug("## identitySelector: getting value\n");
     76        MyLog.debug("prefDialog.xml identitySelector: getting value\n");
    7777        var returnVal = "";
    7878        var listItems = this.childNodes;
    7979        for (var index = 0; index < listItems.length; index++) {
    80             MyLog.debug("## identitySelector: getting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n");
     80            MyLog.debug("prefDialog.xml identitySelector: getting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n");
    8181            if (!listItems[index].checked) returnVal += " :" + listItems[index].getAttribute("value") + ": "
    8282        }
    83         MyLog.debug("## identitySelector: getting value, result '" + returnVal + "'\n");
     83        MyLog.debug("prefDialog.xml identitySelector: getting value, result '" + returnVal + "'\n");
    8484        return returnVal;
    8585        }
  • content/vI_getHeader.js

    rf17e5d3 rbf505e  
    7676        if (aHeaders.has("list-id")) {
    7777          getHeader.hdr.setStringProperty("vI_list-id","found");
    78           Log.debug("## getHeader: found header: list-id  ...stored to recognize mailing-list\n");
     78          Log.debug("found header: list-id  ...stored to recognize mailing-list\n");
    7979        }
    8080        if (aHeaders.has("received")) {
    8181          getHeader.hdr.setStringProperty("vI_received","found");
    82           Log.debug("## getHeader: found header: received  ...stored to recognize received mail\n");
     82          Log.debug("found header: received  ...stored to recognize received mail\n");
    8383        }
    8484        if (aHeaders.has("content-base")) {
    8585          getHeader.hdr.setStringProperty("vI_content_base","found");
    86           Log.debug("## getHeader: found header: content-base  ...stored to recognize blog/news-feed\n");
     86          Log.debug("found header: content-base  ...stored to recognize blog/news-feed\n");
    8787        }
    8888        for (let index = 0; index < getHeader.headerToSearch.length; index++) {
     
    103103              let storedConvValue = getHeader.unicodeConverter.ConvertToUnicode(storedValue);
    104104             
    105               Log.debug("## getHeader: found header: " + headerNameToStore +
     105              Log.debug("found header: " + headerNameToStore +
    106106                  " - stored as '" + storedConvValue + "'\n");
    107107              label += (label)?"\n":""
     
    164164            getHeader.headerToSearch = null;
    165165           
    166             Log.debug("## prefObserver: reload Message\n");
     166            Log.debug("reload Message\n");
    167167            MsgReload();
    168168        }
  • content/vI_msgIdentityCloneTools.js

    rf17e5d3 rbf505e  
    3333
    3434    copySelectedIdentity : function(id_key) {
    35         Log.debug("## msgIdentityCloneTools: copySelectedIdentity\n");
     35        Log.debug("copySelectedIdentity\n");
    3636        var msgIdentityElem = document.getElementById("msgIdentity");
    3737        var msgIdentityPopupElem = document.getElementById("msgIdentityPopup");
     
    5252        try { setSecuritySettings(1); enigSetMenuSettings(''); } catch(vErr) { };
    5353        if (!existingIdentity) {
    54             Log.debug("## msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
     54            Log.debug("signatureSwitch hide/remove signatures\n");
    5555            // code to hide the text signature
    5656            try { if (msgIdentityCloneTools._pref.getBoolPref("hide_signature") && ss_signature.length == 0) {
    57                 Log.debug("## msgIdentityCloneTools: hide text/html signature");
     57                Log.debug("hide text/html signature");
    5858                ss_main.signatureSwitch()
    5959                Log.debug("\n");
     
    6363                var element = document.getElementById("menu_securitySign1");
    6464                if (element.getAttribute("checked") == "true") {
    65                     Log.debug("## signatureSwitch hide_sMime_messageSignature with doCommand\n");
     65                    Log.debug("signatureSwitch hide_sMime_messageSignature with doCommand\n");
    6666                    element.doCommand();
    6767                }
     
    8282                    }
    8383                    if (skipChangeGPGsign)
    84                         Log.debug("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
     84                        Log.debug("signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
    8585                    else {
    86                         Log.debug("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
     86                        Log.debug("signatureSwitch hide_openPGP_messageSignature with doCommand\n");
    8787                        element.doCommand();
    8888                    }
     
    9393        }
    9494        else {
    95             Log.debug("## msgIdentityCloneTools: signatureSwitch restore signature\n");
     95            Log.debug("signatureSwitch restore signature\n");
    9696            // code to show the text signature
    9797            try { if (ss_signature.length > 0) {
    98                 Log.debug("## msgIdentityCloneTools: show text/html signature");
     98                Log.debug("show text/html signature");
    9999                ss_main.signatureSwitch()
    100100                Log.debug("\n");
     
    117117                var awType = awGetPopupElement(row).selectedItem.getAttribute("value");
    118118                if (awType == "addr_reply") {
    119                     Log.debug("## msgIdentityCloneTools: removed ReplyTo found in row " + row + "\n");
     119                    Log.debug("removed ReplyTo found in row " + row + "\n");
    120120                    awDeleteRow(row--); // removed one line therefore decrease row-value
    121121                }
     
    127127        if (!document.getElementById("autoReplyToSelfLabel").hasAttribute("hidden")) {
    128128            awAddRecipient("addr_reply",document.getElementById("msgIdentity_clone").label);
    129             Log.debug("## msgIdentityCloneTools: added ReplyToSelf");
     129            Log.debug("added ReplyToSelf");
    130130            document.getElementById("autoReplyToSelfLabel").setAttribute("hidden","true");
    131131        }
  • content/vI_rdfDataTree.js

    rf17e5d3 rbf505e  
    6161    //this function is called every time the tree is sorted, filtered, or reloaded
    6262    loadTable : function() {
    63 //         Log.debug("## rdfDataTree: loadTable.\n");
     63//         Log.debug("loadTable.\n");
    6464        //remember scroll position. this is useful if this is an editable table
    6565        //to prevent the user from losing the row they edited
     
    9797        // set Tab label
    9898        this.tabElem.setAttribute("label", this.treeType + " (" + this.idTable.length + ")");
    99 //         Log.debug("## rdfDataTree: loadTable done.\n");
     99//         Log.debug("loadTable done.\n");
    100100    },
    101101
     
    110110                resource : resource,
    111111                identityData : localIdentityData}
    112 //      Log.debug("## addNewDatum.\n");
     112//      Log.debug("addNewDatum.\n");
    113113        localIdentityData.extras.addPrefs(pref);
    114114        idData.push(pref);
    115115    },
    116116    sort : function(columnName) {
    117 //      Log.debug("## sort: " + columnName + ".\n");
     117//      Log.debug("sort: " + columnName + ".\n");
    118118        var order = this.treeElem.getAttribute("sortDirection") == "ascending" ? 1 : -1;
    119119        //if the column is passed and it's already sorted by that column, reverse sort
  • content/vI_smartIdentity.js

    rf17e5d3 rbf505e  
    4444        var newsgroup = gMsgCompose.compFields.newsgroups;
    4545        var autocreate = false;
    46         Log.debug("## smartIdentity: msgComposeTypeReference = " + gMsgCompose.type + "\n");
     46        Log.debug("msgComposeTypeReference = " + gMsgCompose.type + "\n");
    4747        switch (gMsgCompose.type) {
    4848            case msgComposeTypeReference.Reply:
     
    5353            case msgComposeTypeReference.ReplyWithTemplate:
    5454            case msgComposeTypeReference.ReplyToList:
    55                 Log.debug("## smartIdentity: Reply\n");
     55                Log.debug("Reply\n");
    5656                msgHdr = smartIdentity.messenger.
    5757                    messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
     
    6161            case msgComposeTypeReference.Draft:
    6262            case msgComposeTypeReference.Template:
    63                 Log.debug("## smartIdentity: Draft\n");
     63                Log.debug("Draft\n");
    6464                msgHdr = smartIdentity.messenger.
    6565                    messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId);
     
    7272            case msgComposeTypeReference.NewsPost:
    7373            case msgComposeTypeReference.MailToUrl:
    74                 Log.debug("## smartIdentity: New Mail\n");
     74                Log.debug("New Mail\n");
    7575                smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(null, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients());   
    7676                // to enable composing new email with new identity: identity is hidden in subject line
     
    7878                var subject = gMsgCompose.compFields.subject.split(/\n/);
    7979                if (subject.length > 1 && subject[1] == "virtualIdentityExtension") {
    80                     Log.debug("## smartIdentity: NewMail() found stored identity preset: " + subject[2] + "\n");
     80                    Log.debug("NewMail() found stored identity preset: " + subject[2] + "\n");
    8181                    smartIdentity._smartIdentityCollection.__parseHeadersWithArray(subject[2], smartIdentity._smartIdentityCollection._allIdentities);
    8282                    gMsgCompose.compFields.subject = subject[0];
     
    101101   
    102102    __smartIdentitySelection : function(autocreate) {
    103         Log.debug("## __smartIdentitySelection autocreate=" + autocreate + "\n");
     103        Log.debug("__smartIdentitySelection autocreate=" + autocreate + "\n");
    104104       
    105105        if (smartIdentity._pref.getBoolPref("idSelection_preferExisting")) {
    106106            var existingIDIndex = smartIdentity._smartIdentityCollection._foundExistingIdentity();
    107107            if (existingIDIndex) {
    108                 Log.debug("## smartIdentity: found existing Identity, use without interaction.\n");
     108                Log.debug("found existing Identity, use without interaction.\n");
    109109                // add all Indentities to Clone Menu before selecting and leaving the function
    110110                document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
     
    115115       
    116116        document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
    117         Log.debug("## __smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" +
     117        Log.debug("__smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" +
    118118                smartIdentity._smartIdentityCollection._allIdentities.number +
    119119                " smartIdentity._pref.getBoolPref('idSelection_ask_always')=" +
     
    125125                || smartIdentity._smartIdentityCollection._allIdentities.number > 1)) {
    126126            for (var index = 0; index < smartIdentity._smartIdentityCollection._allIdentities.number; index++) {
    127                 Log.debug("## smartIdentityReplyDialog index=" + index + ": '" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].combinedName + "' "
     127                Log.debug("smartIdentityReplyDialog index=" + index + ": '" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].combinedName + "' "
    128128                    + "(" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].id.value + "," + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].smtp.value + ")\n");
    129129            }
     
    139139   
    140140    changeIdentityToSmartIdentity : function(allIdentities, selectedValue) {
    141         Log.debug("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number + "\n");
    142         Log.debug("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
     141        Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number + "\n");
     142        Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
    143143            + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")\n");
    144144        document.getElementById("msgIdentity_clone").selectedMenuItem = allIdentities.menuItems[selectedValue];
  • content/vI_storage.js

    rf17e5d3 rbf505e  
    4646
    4747    clean: function() {
    48         Log.debug("## storage: clean.\n");
     48        Log.debug("clean.\n");
    4949        storage.multipleRecipients = null;
    5050        storage.lastCheckedEmail = {};
     
    6060    replacement_functions : {
    6161        awSetInputAndPopupValue : function (inputElem, inputValue, popupElem, popupValue, rowNumber) {
    62             Log.debug("## storage: awSetInputAndPopupValue '" + inputElem.id +"'\n");
     62            Log.debug("awSetInputAndPopupValue '" + inputElem.id +"'\n");
    6363            storage.original_functions.awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber);
    6464            storage.updateVIdentityFromStorage(inputElem);
     
    6969        // only react on events triggered by addressCol2 - textinput Elements
    7070        if (!element || ! element.id.match(/^addressCol2*/)) return;
    71         Log.debug("\n## storage: awOnBlur '" + element.id +"'\n");
     71        Log.debug("\nawOnBlur '" + element.id +"'\n");
    7272        storage.updateVIdentityFromStorage(element);
    7373        storage.focusedElement = null;
     
    8080
    8181    awPopupOnCommand : function (element) {
    82         Log.debug("\n## storage: awPopupOnCommand'" + element.id +"'\n");
     82        Log.debug("\nawPopupOnCommand'" + element.id +"'\n");
    8383        storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2")));
    8484        if (element.selectedItem.getAttribute("value") == "addr_reply") // if reply-to is manually entered disable AutoReplyToSelf
     
    132132    updateVIdentityFromStorage: function(inputElement) {
    133133        if (!storage._pref.getBoolPref("storage"))
    134             { Log.debug("## storage: Storage deactivated\n"); return; }
    135         Log.debug("## storage: updateVIdentityFromStorage()\n");
     134            { Log.debug("Storage deactivated\n"); return; }
     135        Log.debug("updateVIdentityFromStorage()\n");
    136136
    137137        var recipientType = document.getElementById(inputElement.id.replace(/^addressCol2/,"addressCol1"))
     
    142142            if (storage.firstUsedInputElement == inputElement)
    143143                storage.firstUsedInputElement = null;
    144             Log.debug("## storage: field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n")
     144            Log.debug("field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n")
    145145            return;
    146146        }
    147147       
    148148        if (inputElement.value == "") {
    149             Log.debug("## storage: no recipient found, not checked.\n"); return;
     149            Log.debug("no recipient found, not checked.\n"); return;
    150150        }
    151151       
    152152        var row = inputElement.id.replace(/^addressCol2#/,"")
    153153        if (storage.lastCheckedEmail[row] && storage.lastCheckedEmail[row] == inputElement.value) {
    154             Log.debug("## storage: same email than before, not checked again.\n"); return;
     154            Log.debug("same email than before, not checked again.\n"); return;
    155155        }
    156156        storage.lastCheckedEmail[row] = inputElement.value;
     
    163163       
    164164        if (storageResult.identityCollection.number == 0) return; // return if there was no match
    165         Log.debug("## storage: updateVIdentityFromStorage result: " + storageResult.result + "\n");
     165        Log.debug("updateVIdentityFromStorage result: " + storageResult.result + "\n");
    166166        // found storageData, so store InputElement
    167167        if (!storage.firstUsedInputElement) storage.firstUsedInputElement = inputElement;
     
    170170        if (storageResult.result != "equal") {
    171171            for (var j = 0; j < storageResult.identityCollection.number; j++) {
    172                 Log.debug("## storage: updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n");
     172                Log.debug("updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n");
    173173                selectedMenuItem = document.getElementById("msgIdentity_clone").addIdentityToCloneMenu(storageResult.identityCollection.identityDataCollection[j])
    174174            }
    175175        }
    176176        if (storageResult.result == "accept") {
    177             Log.debug("## storage: updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n");
     177            Log.debug("updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n");
    178178            document.getElementById("msgIdentity_clone").selectedMenuItem = selectedMenuItem;
    179179            if (document.getElementById("msgIdentity_clone").vid)
     
    190190        for (var index = 0; index < doBccArray.count; index++ ) {
    191191            if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
    192                 Log.debug("## storage: ignoring doBcc field '" +
     192                Log.debug("ignoring doBcc field '" +
    193193                    doBccArray.StringAt(index) + "'.\n");
    194194                return true;
  • content/vI_storageExtras.js

    rf17e5d3 rbf505e  
    9494    loopForRDF : function(rdfDatasource, resource, type) {
    9595        for( var i = 0; i < this.extras.length; i++ ) {
    96 //          Log.debug("## vI.rdfDatasource: loopForRDF " + rdfDatasource + "\n");
     96//          Log.debug("loopForRDF " + rdfDatasource + "\n");
    9797            // only if pref set and feature(element available) or for dataEditor
    9898            if (typeof(gMsgCompose) == "undefined" || !gMsgCompose || this.extras[i].active) {
     
    171171        for( var i = 0; i < this.extras.length; i++ ) {
    172172            if (this.extras[i].active) this.extras[i].readIdentityValue(identity)
    173 //          Log.debug("## storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
     173//          Log.debug("readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
    174174        }
    175175    },
     
    178178        for( var i = 0; i < this.extras.length; i++ ) {
    179179            if (this.extras[i].active) this.extras[i].setValue()
    180 //          Log.debug("## storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
     180//          Log.debug("setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
    181181        }
    182182    },
    183183    readValues : function() {
    184184        for( var i = 0; i < this.extras.length; i++ ) {
    185 //          Log.debug("## storageExtras preparing readValue "+ this.extras[i].field +"\n");
     185//          Log.debug("preparing readValue "+ this.extras[i].field +"\n");
    186186            if (this.extras[i].active) this.extras[i].readValue()
    187 //              Log.debug("## storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
     187//              Log.debug("readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
    188188        }
    189189    },
     
    194194        for( var i = 0; i < this.extras.length; i++ ) {
    195195            this.extras[i].readEditorValue();
    196 //          Log.debug("## storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");
     196//          Log.debug("readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");
    197197        }
    198198    },
     
    380380    // function to set or read the value from/to the MessageCompose Dialog
    381381    setValue : function() {
    382         Log.debug("## storageExtras_sMime_messageEncryption \n");
     382        Log.debug("sMime_messageEncryption \n");
    383383        var doEncryptElem = document.getElementById("menu_securityEncryptRequire1");
    384384        if (this.value == null) return;
     
    462462
    463463        if ((element.getAttribute("checked") == "true") != (this.value == "true")) {
    464             Log.debug("## storageExtras change "+ this.field + " to " + this.value + " with doCommand\n");
     464            Log.debug("change "+ this.field + " to " + this.value + " with doCommand\n");
    465465            element.doCommand();
    466466        }
  • content/v_identity.js

    rf17e5d3 rbf505e  
    6767    ComposeStateListener : {
    6868        NotifyComposeBodyReady: function() {
    69             Log.debug("## v_identity: NotifyComposeBodyReady\n");
     69            Log.debug("NotifyComposeBodyReady\n");
    7070            main.initSystemStage2();
    7171        },
    7272        NotifyComposeFieldsReady: function() {
    73             Log.debug("## v_identity: NotifyComposeFieldsReady\n");
     73            Log.debug("NotifyComposeFieldsReady\n");
    7474        },
    7575        ComposeProcessDone: function(aResult) {
    76             Log.debug("## v_identity: StateListener reports ComposeProcessDone\n");
     76            Log.debug("StateListener reports ComposeProcessDone\n");
    7777            main.Cleanup(); // not really required, parallel handled by main.close
    7878            vI.storage.clean();
    7979        },
    8080        SaveInFolderDone: function(folderURI) {
    81             Log.debug("## v_identity: SaveInFolderDone\n");
     81            Log.debug("SaveInFolderDone\n");
    8282            main.Cleanup();
    8383            vI.storage.clean();
     
    8787    replacement_functions : {
    8888        FillIdentityList: function(menulist) {
    89             Log.debug("## v_identity: mod. FillIdentityList\n");
     89            Log.debug("mod. FillIdentityList\n");
    9090            var accounts = queryISupportsArray(main.accountManager.accounts,
    9191                                     Components.interfaces.nsIMsgAccount);
     
    139139            vI.storage.awOnBlur(vI.storage.focusedElement);
    140140
    141             Log.debug("\n## v_identity: VIdentity_GenericSendMessage\n");
     141            Log.debug("\nVIdentity_GenericSendMessage\n");
    142142           
    143143            if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now) { vI.msgIdentityCloneTools.addReplyToSelf(); }
     
    151151            if (returnValue.update == "abort") {
    152152                main.replacement_functions.GenericSendMessageInProgress = false;
    153                 Log.debug("## sending: --------------  aborted  ---------------------------------\n")
     153                Log.debug("sending: --------------  aborted  ---------------------------------\n")
    154154                return;
    155155            }
     
    158158                    msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(returnValue.storedIdentity);
    159159                    main.replacement_functions.GenericSendMessageInProgress = false;
    160                     Log.debug("## sending: --------------  aborted  ---------------------------------\n")
     160                    Log.debug("sending: --------------  aborted  ---------------------------------\n")
    161161                    return;
    162162            }
     
    171171            else    main.Cleanup();
    172172            main.replacement_functions.GenericSendMessageInProgress = false;
    173             //          Log.debug("## v_identity: original_functions.GenericSendMessage done\n");
     173            //          Log.debug("original_functions.GenericSendMessage done\n");
    174174        },
    175175       
    176176        replace_FillIdentityList : function() {
    177             //~ Log.debug("## v_identity: replace FillIdentityList \n");
     177            //~ Log.debug("replace FillIdentityList \n");
    178178            main.original_functions.FillIdentityList = FillIdentityList;
    179179            FillIdentityList = main.replacement_functions.FillIdentityList;
     
    184184        window.removeEventListener('compose-window-reopen', main.reopen, true);
    185185        window.removeEventListener('compose-window-close', main.close, true);
    186         Log.debug("## v_identity: end. remove Account if there.\n")
     186        Log.debug("end. remove Account if there.\n")
    187187        main.Cleanup();
    188188        vI.storage.clean();
     
    208208        for (var index = 0; index < doBccArray.count; index++ ) {
    209209            if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
    210                 Log.debug("## main _recipientIsDoBcc: ignoring doBcc field '" +
     210                Log.debug("_recipientIsDoBcc: ignoring doBcc field '" +
    211211                    doBccArray.StringAt(index) + "'.\n");
    212212                return true;
     
    221221        window.removeEventListener('compose-window-init', main.init, true);
    222222        if (main.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen)
    223         Log.debug("\n## v_identity: init.\n")
     223        Log.debug("\ninit.\n")
    224224        main.unicodeConverter.charset="UTF-8";
    225         if (!main.adapt_genericSendMessage()) { Log.debug("\n## v_identity: init failed.\n"); return; }
     225        if (!main.adapt_genericSendMessage()) { Log.debug("\ninit failed.\n"); return; }
    226226       
    227227        main.adapt_interface();
     
    238238       
    239239        main.initSystemStage1();
    240         Log.debug("## v_identity: init done.\n\n")
     240        Log.debug("init done.\n\n")
    241241    },
    242242   
    243243    initSystemStage1 : function() {
    244         Log.debug("## v_identity: initSystemStage1.\n")
     244        Log.debug("initSystemStage1.\n")
    245245        main.gMsgCompose = gMsgCompose;
    246246        document.getElementById("msgIdentity_clone").init();
    247247        vI.statusmenu.init();
    248         Log.debug("## v_identity: initSystemStage1 done.\n")
     248        Log.debug("initSystemStage1 done.\n")
    249249    },
    250250   
    251251    initSystemStage2 : function() {
    252         Log.debug("## v_identity: initSystemStage2.\n")
     252        Log.debug("initSystemStage2.\n")
    253253        vI.msgIdentityCloneTools.initReplyTo();
    254254        vI.storage.init();
    255255        vI.smartIdentity.init();
    256         Log.debug("## v_identity: initSystemStage2 done.\n")
     256        Log.debug("initSystemStage2 done.\n")
    257257    },
    258258   
     
    290290    adapt_genericSendMessage : function() {
    291291        if (main.original_functions.GenericSendMessage) return true; // only initialize this once
    292         Log.debug("## v_identity: adapt GenericSendMessage\n");
     292        Log.debug("adapt GenericSendMessage\n");
    293293        main.original_functions.GenericSendMessage = GenericSendMessage;
    294294        GenericSendMessage = main.replacement_functions.GenericSendMessage;
     
    298298    reopen: function() {
    299299        clearDebugOutput();
    300         Log.debug("## v_identity: composeDialog reopened. (msgType " + gMsgCompose.type + ")\n")
     300        Log.debug("composeDialog reopened. (msgType " + gMsgCompose.type + ")\n")
    301301       
    302302        // clean all elements
    303303        document.getElementById("msgIdentity_clone").clean();
    304         Log.debug("## v_identity: everything cleaned.\n")
     304        Log.debug("everything cleaned.\n")
    305305       
    306306        // now (re)init the elements
     
    329329                gMsgCompose.RegisterStateListener(main.ComposeStateListener);
    330330        }
    331         Log.debug("## v_identity: reopen done.\n")
     331        Log.debug("reopen done.\n")
    332332    },
    333333   
     
    386386        observe : function(subject, topic, data) {
    387387            if (topic == "am-smtpChanges") {
    388                 Log.debug("## v_identity: smtp changes observed\n");
     388                Log.debug("smtp changes observed\n");
    389389                var msgIdentity_clone = document.getElementById("msgIdentity_clone");
    390390                document.getAnonymousElementByAttribute(msgIdentity_clone, "class", "smtpServerListHbox").refresh();
    391391            }
    392392            if (topic == "am-acceptChanges") {
    393                 Log.debug("## v_identity: account changes observed\n");
     393                Log.debug("account changes observed\n");
    394394                document.getElementById("msgIdentity_clone").clean();
    395395                document.getElementById("msgIdentity_clone").init();
Note: See TracChangeset for help on using the changeset viewer.