Changeset fe0698


Ignore:
Timestamp:
Nov 26, 2011, 11:23:10 PM (8 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
036c4d
Parents:
eacce6
Message:

cleaned debugging from newline - thats standard

Files:
24 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/vI_rdfAccountMismatchDialog.xml

    reacce6 rfe0698  
    155155    <method name="_addIdentities">
    156156        <body><![CDATA[
    157         virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addIdentities.\n");
     157        virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addIdentities.");
    158158        var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
    159159            .getService(Components.interfaces.nsIMsgAccountManager);
     
    177177        <parameter name="server" />
    178178        <body><![CDATA[
    179             virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addSmtp.\n");
     179            virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addSmtp.");
    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             virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addSmtpServers.\n");
     192            virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: _addSmtpServers.");
    193193           
    194194            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
     
    214214    <constructor>
    215215        <![CDATA[       
    216         virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: constructor.\n");
     216        virtualIdentityExtension.Log.debug("rdfAccountMismatchDialog.xml mismatchID-menupopup: constructor.");
    217217        const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
    218218        this.appendChild(document.createElementNS(XUL_NS, "menuseparator")); // create a new XUL menuseparator
  • content/bindings/v_identity.xml

    reacce6 rfe0698  
    7575    <method name="popupshowing">
    7676            <body><![CDATA[
    77             virtualIdentityExtension.MyLog.debug("** v_identity.xml vI_tooltipPopupset popupshowing.\n")
     77            virtualIdentityExtension.MyLog.debug("v_identity.xml vI_tooltipPopupset popupshowing.")
    7878        if (!this._identityInfo) {
    7979            this._identityInfo =
     
    8585                    "</td>" +
    8686                "</tr></table>"
    87             virtualIdentityExtension.MyLog.debug("** v_identity.xml added tooltip with id='" +  this.elem.identityData.id.key + "'\n")
     87            virtualIdentityExtension.MyLog.debug("v_identity.xml added tooltip with id='" +  this.elem.identityData.id.key + "'")
    8888            this._tooltipBrowser.outputString = this._identityInfo;
    8989        }
    90         virtualIdentityExtension.MyLog.debug("** v_identity.xml vI_tooltipPopupset popupshowing done.\n")
     90        virtualIdentityExtension.MyLog.debug("v_identity.xml vI_tooltipPopupset popupshowing done.")
    9191        ]]></body>
    9292    </method>
     
    130130        this.label = this._identityDataStorage.combinedName;
    131131        this.value = this._identityDataStorage.id.key;
    132         virtualIdentityExtension.MyLog.debug("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n")
     132        virtualIdentityExtension.MyLog.debug("v_identity.xml fromPopupItem_clone constructor id='" + this.value)
    133133
    134134        this.description = this._identityDataStorage.sideDescription;
    135135        this.smtp = this._identityDataStorage.smtp.value;
    136         virtualIdentityExtension.MyLog.debug("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")
     136        virtualIdentityExtension.MyLog.debug("v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp)
    137137        this.smtpStyle = "width:" + document.getElementById("virtualIdentityExtension_SmtpServerList").clientWidth + "px;";
    138138        this._identityDataStorage.smtp.value;
     
    252252        <setter><![CDATA[
    253253        if (val == virtualIdentityExtension.NO_SMTP_TAG) return; // dont overwrite if not set
    254         virtualIdentityExtension.MyLog.debug("** v_identity.xml smtp set to '" + val + "'\n")
     254        virtualIdentityExtension.MyLog.debug("v_identity.xml smtp set to '" + val + "'")
    255255        var MenuItems = this._smtpPopup.childNodes
    256256        for (var index = 0; index < MenuItems.length; index++) {
     
    353353    <method name="command">
    354354        <body><![CDATA[
    355         virtualIdentityExtension.MyLog.debug("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")
    356         virtualIdentityExtension.MyLog.debug("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")
     355        virtualIdentityExtension.MyLog.debug("\nv_identity.xml msgIdentityCloneElem.doCommand()")
    357356        // copy selected Menu-Value from clone to orig.
    358         virtualIdentityExtension.MyLog.debug("** v_identity.xml copy selected Menu-Value from clone to orig. Searching for id=" + this.selectedMenuItem.identityData.id.key + " \n")
     357        virtualIdentityExtension.MyLog.debug("v_identity.xml copy selected Menu-Value from clone to orig. Searching for id=" + this.selectedMenuItem.identityData.id.key)
    359358        if ( this.selectedMenuItem.identityData.id.key != null ) {
    360359            var MenuItems = this._msgIdentityPopupElem.childNodes
     
    369368        }
    370369        this.identityData = this.selectedMenuItem.identityData.getDuplicate();
    371         virtualIdentityExtension.MyLog.debug("\n** v_identity.xml msgIdentityCloneElem.doCommand() this.value=" + this.value + "\n");
     370        virtualIdentityExtension.MyLog.debug("\nv_identity.xml msgIdentityCloneElem.doCommand() this.value=" + this.value);
    372371        // if current SMTP is empty, take the one from current Identity
    373372        if (this.identityData.smtp.hasNoDefinedSMTP()) {
     
    501500        <getter><![CDATA[
    502501            if (!this._msgIdentityElem.selectedItem) {
    503                 virtualIdentityExtension.MyLog.debug("** v_identity.xml: msgIdentityElem.selectedItem not set, using first Menuitem\n");
     502                virtualIdentityExtension.MyLog.debug("v_identity.xml: msgIdentityElem.selectedItem not set, using first Menuitem");
    504503                this._msgIdentityElem.selectedItem = this._msgIdentityPopupElem.firstChild
    505                 virtualIdentityExtension.MyLog.debug("** v_identity.xml: msgIdentityElem.doCommand()\n");
     504                virtualIdentityExtension.MyLog.debug("v_identity.xml: msgIdentityElem.doCommand()");
    506505                this._msgIdentityElem.doCommand();
    507506            }
     
    511510    <method name="blurEvent">
    512511            <body><![CDATA[
    513         virtualIdentityExtension.MyLog.debug("\n** v_identity.xml blurEvent")
     512        virtualIdentityExtension.MyLog.debug("v_identity.xml blurEvent")
    514513        this.inputEvent(); // timeout might prevent inputEvent to fire before blurEvent
    515514       
     
    520519    <method name="inputEvent">
    521520            <body><![CDATA[     
    522         virtualIdentityExtension.MyLog.debug("\n** v_identity.xml inputEvent\n")
     521        virtualIdentityExtension.MyLog.debug("v_identity.xml inputEvent")
    523522       
    524523        this.identityData.combinedName = this.label;
     
    530529    <method name="checkForVirtualIdentity">
    531530        <body><![CDATA[
    532         virtualIdentityExtension.MyLog.debug("** v_identity.xml checkForVirtualIdentity: " + this.identityData.id.key + " '" + this.identityData.id.value + "'\n")
     531        virtualIdentityExtension.MyLog.debug("v_identity.xml checkForVirtualIdentity: " + this.identityData.id.key + " '" + this.identityData.id.value + "'")
    533532        var existingIdentity = this.identityData.isExistingIdentity(false);
    534533       
     
    556555        ]]></getter>
    557556        <setter><![CDATA[
    558         virtualIdentityExtension.MyLog.debug("** v_identity.xml identityData setter\n")
     557        virtualIdentityExtension.MyLog.debug("v_identity.xml identityData setter")
    559558        if (!val) this._identityDataStorage = null
    560559        else {
     
    562561            this._identityDataStorage = val;
    563562            if (oldIdentityData) { // indicates that it's not first time after clean
    564                 virtualIdentityExtension.MyLog.debug("** v_identity.xml previousID: fullName='" + oldIdentityData.fullName + "' email='" + oldIdentityData.email + "' smtp='" + oldIdentityData.smtp.key + "' id='" + oldIdentityData.id.key + "' existingID='" + oldIdentityData.existingID + "'\n");
    565                 virtualIdentityExtension.MyLog.debug("** v_identity.xml newID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'\n");
     563                virtualIdentityExtension.MyLog.debug("v_identity.xml previousID: fullName='" + oldIdentityData.fullName + "' email='" + oldIdentityData.email + "' smtp='" + oldIdentityData.smtp.key + "' id='" + oldIdentityData.id.key + "' existingID='" + oldIdentityData.existingID + "'");
     564                virtualIdentityExtension.MyLog.debug("v_identity.xml newID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'");
    566565                if (!this._identityDataStorage.existingID && !this._identityDataStorage.combinedName)
    567566                    this._identityDataStorage.fullName = oldIdentityData.fullName;
     
    580579            this.description = this._identityDataStorage.sideDescription;
    581580            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp.keyNice;
    582             virtualIdentityExtension.MyLog.debug("** v_identity.xml resultingID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'\n");           
    583         }
    584         virtualIdentityExtension.MyLog.debug("** v_identity.xml identityData setter done.'\n")
     581            virtualIdentityExtension.MyLog.debug("v_identity.xml resultingID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'");
     582        }
     583        virtualIdentityExtension.MyLog.debug("v_identity.xml identityData setter done.")
    585584        ]]></setter>
    586585    </property>
  • content/prefDialog/vI_prefDialog.js

    reacce6 rfe0698  
    343343        var uri = Components.classes["@mozilla.org/network/standard-url;1"].createInstance(Components.interfaces.nsIURI);
    344344        var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].getService(Components.interfaces.nsIExternalProtocolService);
    345         Log.debug("load url " + aURL + "\n");
     345        Log.debug("load url " + aURL);
    346346        uri.spec = aURL;
    347347        protocolSvc.loadUrl(uri);
  • content/prefDialog/vI_prefDialog.xml

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

    reacce6 rfe0698  
    7171        if (aHeaders.has("list-id")) {
    7272          getHeader.hdr.setStringProperty("vI_list-id","found");
    73           Log.debug("found header: list-id  ...stored to recognize mailing-list\n");
     73          Log.debug("found header: list-id  ...stored to recognize mailing-list");
    7474        }
    7575        if (aHeaders.has("received")) {
    7676          getHeader.hdr.setStringProperty("vI_received","found");
    77           Log.debug("found header: received  ...stored to recognize received mail\n");
     77          Log.debug("found header: received  ...stored to recognize received mail");
    7878        }
    7979        if (aHeaders.has("content-base")) {
    8080          getHeader.hdr.setStringProperty("vI_content_base","found");
    81           Log.debug("found header: content-base  ...stored to recognize blog/news-feed\n");
     81          Log.debug("found header: content-base  ...stored to recognize blog/news-feed");
    8282        }
    8383        for (let index = 0; index < getHeader.headerToSearch.length; index++) {
     
    9999             
    100100              Log.debug("found header: " + headerNameToStore +
    101                   " - stored as '" + storedConvValue + "'\n");
     101                  " - stored as '" + storedConvValue + "'");
    102102              label += (label)?"\n":""
    103103              label += headerNameToStore + ":\t" + storedConvValue
  • content/vI_rdfAccountMismatchDialog.js

    reacce6 rfe0698  
    4141        for (var i = 0; i < rdfAccountMismatchDialog.mismatchItems.length; i++) {
    4242//             var label = document.createElement("label");
    43             Log.debug("adding line " + i + " for label " + rdfAccountMismatchDialog.mismatchItems[i].label + "\n");
    44        
    4543            var listitem = document.createElement("listitem");
    4644            listitem.setAttribute("id", "virtualIdentityExtension_mismatchLine_" + i);
     
    5351            listitem.setAttribute("count",rdfAccountMismatchDialog.mismatchItems[i].count);
    5452            document.getElementById("virtualIdentityExtension_rdfAccountMismatchDialog_listbox").appendChild(listitem)
    55             Log.debug("line added\n");
    5653        }
    5754    },
  • content/vI_rdfDataEditor.js

    reacce6 rfe0698  
    9595       
    9696        // set extra values
    97         Log.debug("set Values to Environment\n");
    9897        rdfDataEditor.__identityData.extras.setValuesToEnvironment();
    99         Log.debug("init nearly done\n");
    10098        this.hideUnusedEditorFields();
    101         Log.debug("init done\n");
     99        Log.debug("init done");
    102100    },
    103101   
     
    132130   
    133131    accept : function() {
    134         Log.debug("accept\n");
     132        Log.debug("accept");
    135133        var localIdentityData = new vI.identityData(document.getElementById("sender").value, null,
    136134            document.getElementById("virtualIdentityExtension_IdentityList").selectedItem.getAttribute("value"),
    137135            document.getElementById("virtualIdentityExtension_SmtpServerList").selectedItem.getAttribute("key"));
    138         Log.debug("before getValuesFromEnvironment\n");
    139136        localIdentityData.extras.getValuesFromEnvironment();
    140         Log.debug("after getValuesFromEnvironment\n");
    141137        rdfDataEditor.__rdfDatasource.updateRDF(
    142138                document.getElementById("recipient").value,
     
    144140                localIdentityData,
    145141                true, true, rdfDataEditor.__recipient, rdfDataEditor.__type);
    146         Log.debug("updateRDF done " + localIdentityData.extras.status() + "\n");
     142        Log.debug("updateRDF done " + localIdentityData.extras.status());
    147143        return document.getElementById("type_menu").selectedItem.getAttribute("key");
    148144    }
  • content/vI_rdfDataTree.js

    reacce6 rfe0698  
    6565    //this function is called every time the tree is sorted, filtered, or reloaded
    6666    loadTable : function() {
    67 //         Log.debug("loadTable.\n");
     67//         Log.debug("loadTable.");
    6868        //remember scroll position. this is useful if this is an editable table
    6969        //to prevent the user from losing the row they edited
     
    101101        // set Tab label
    102102        this.tabElem.setAttribute("label", this.treeType + " (" + this.idTable.length + ")");
    103 //         Log.debug("loadTable done.\n");
     103//         Log.debug("loadTable done.");
    104104    },
    105105
     
    114114                resource : resource,
    115115                identityData : localIdentityData}
    116 //      Log.debug("addNewDatum.\n");
     116//      Log.debug("addNewDatum.");
    117117        localIdentityData.extras.addPrefs(pref);
    118118        idData.push(pref);
    119119    },
    120120    sort : function(columnName) {
    121 //      Log.debug("sort: " + columnName + ".\n");
     121//      Log.debug("sort: " + columnName);
    122122        var order = this.treeElem.getAttribute("sortDirection") == "ascending" ? 1 : -1;
    123123        //if the column is passed and it's already sorted by that column, reverse sort
  • content/vI_smartIdentity.js

    reacce6 rfe0698  
    4848        var newsgroup = gMsgCompose.compFields.newsgroups;
    4949        var autocreate = false;
    50         Log.debug("msgComposeTypeReference = " + gMsgCompose.type + "\n");
     50        Log.debug("msgComposeTypeReference = " + gMsgCompose.type);
    5151        switch (gMsgCompose.type) {
    5252            case msgComposeTypeReference.Reply:
     
    5757            case msgComposeTypeReference.ReplyWithTemplate:
    5858            case msgComposeTypeReference.ReplyToList:
    59                 Log.debug("Reply\n");
     59                Log.debug("Reply");
    6060                msgHdr = smartIdentity.messenger.
    6161                    messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
     
    6565            case msgComposeTypeReference.Draft:
    6666            case msgComposeTypeReference.Template:
    67                 Log.debug("Draft\n");
     67                Log.debug("Draft");
    6868                msgHdr = smartIdentity.messenger.
    6969                    messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId);
     
    7676            case msgComposeTypeReference.NewsPost:
    7777            case msgComposeTypeReference.MailToUrl:
    78                 Log.debug("New Mail\n");
     78                Log.debug("New Mail");
    7979                smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(null, getCurrentIdentity(), document.getElementById("virtualIdentityExtension_msgIdentityClone").vid, newsgroup, this._getRecipients());   
    8080                // to enable composing new email with new identity: identity is hidden in subject line
     
    8282                var subject = gMsgCompose.compFields.subject.split(/\n/);
    8383                if (subject.length > 1 && subject[1] == "virtualIdentityExtension") {
    84                     Log.debug("NewMail() found stored identity preset: " + subject[2] + "\n");
     84                    Log.debug("NewMail() found stored identity preset: " + subject[2]);
    8585                    smartIdentity._smartIdentityCollection.__parseHeadersWithArray(subject[2], smartIdentity._smartIdentityCollection._allIdentities);
    8686                    gMsgCompose.compFields.subject = subject[0];
     
    105105   
    106106    __smartIdentitySelection : function(autocreate) {
    107         Log.debug("__smartIdentitySelection autocreate=" + autocreate + "\n");
     107        Log.debug("__smartIdentitySelection autocreate=" + autocreate);
    108108       
    109109        if (vI.vIprefs.get("idSelection_preferExisting")) {
    110110            var existingIDIndex = smartIdentity._smartIdentityCollection._foundExistingIdentity();
    111111            if (existingIDIndex) {
    112                 Log.debug("found existing Identity, use without interaction.\n");
     112                Log.debug("found existing Identity, use without interaction.");
    113113                // add all Indentities to Clone Menu before selecting and leaving the function
    114114                document.getElementById("virtualIdentityExtension_msgIdentityClone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities);
     
    124124                vI.vIprefs.get("idSelection_ask_always") +
    125125                " vI.vIprefs.get('idSelection_ask')=" +
    126                 vI.vIprefs.get("idSelection_ask") + "\n");
     126                vI.vIprefs.get("idSelection_ask"));
    127127        if (!autocreate && vI.vIprefs.get("idSelection_ask") &&
    128128            ((smartIdentity._smartIdentityCollection._allIdentities.number == 1 && vI.vIprefs.get("idSelection_ask_always"))
     
    130130            for (var index = 0; index < smartIdentity._smartIdentityCollection._allIdentities.number; index++) {
    131131                Log.debug("smartIdentityReplyDialog index=" + index + ": '" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].combinedName + "' "
    132                     + "(" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].id.value + "," + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].smtp.value + ")\n");
     132                    + "(" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].id.value + "," + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].smtp.value + ")");
    133133            }
    134134            window.openDialog("chrome://v_identity/content/vI_smartReplyDialog.xul",0,
     
    143143   
    144144    changeIdentityToSmartIdentity : function(allIdentities, selectedValue) {
    145         Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number + "\n");
     145        Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number);
    146146        Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
    147             + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")\n");
     147            + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")");
    148148        document.getElementById("virtualIdentityExtension_msgIdentityClone").selectedMenuItem = allIdentities.menuItems[selectedValue];
    149149        if (document.getElementById("virtualIdentityExtension_msgIdentityClone").vid) {
  • content/vI_statusmenu.js

    reacce6 rfe0698  
    4646   
    4747    observe: function(self, subject, topic, data) {
    48 //         Log.debug("statusmenu observe " + data + "\n");
     48//         Log.debug("statusmenu observe " + data);
    4949        switch (data) {
    5050            case "fcc_show_switch":
     
    6161                break;
    6262            case "storage_show_SMTP_switch":
    63 //                 Log.debug("changed storage_show_SMTP_switch to " + statusmenu.objSaveSMTPMenuItem + "=" + vI.vIprefs.get(data) + "\n");
     63//                 Log.debug("changed storage_show_SMTP_switch to " + statusmenu.objSaveSMTPMenuItem + "=" + vI.vIprefs.get(data));
    6464                statusmenu.objSaveSMTPSwitch.setAttribute("hidden", !vI.vIprefs.get(data));
    6565                break;
     
    7171                break;
    7272            case "storage_store_SMTP":
    73 //                 Log.debug("changed storage_store_SMTP to " + statusmenu.objSaveSMTPMenuItem + "=" + vI.vIprefs.get(data) + "\n");
     73//                 Log.debug("changed storage_store_SMTP to " + statusmenu.objSaveSMTPMenuItem + "=" + vI.vIprefs.get(data));
    7474                statusmenu.objSaveSMTPMenuItem.setAttribute("checked", vI.vIprefs.get(data));
    75 //                 Log.debug("changed storage_store_SMTP done\n");
     75//                 Log.debug("changed storage_store_SMTP done");
    7676                break;
    7777            case "storage_colorIndication":
  • content/vI_storage.js

    reacce6 rfe0698  
    4949
    5050    clean: function() {
    51         Log.debug("clean.\n");
     51        Log.debug("clean.");
    5252        storage.multipleRecipients = null;
    5353        storage.lastCheckedEmail = {};
     
    6363    replacement_functions : {
    6464        awSetInputAndPopupValue : function (inputElem, inputValue, popupElem, popupValue, rowNumber) {
    65             Log.debug("awSetInputAndPopupValue '" + inputElem.id +"'\n");
     65            Log.debug("awSetInputAndPopupValue '" + inputElem.id + "'");
    6666            storage.original_functions.awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber);
    6767            storage.updateVIdentityFromStorage(inputElem);
     
    7272        // only react on events triggered by addressCol2 - textinput Elements
    7373        if (!element || ! element.id.match(/^addressCol2*/)) return;
    74         Log.debug("\nawOnBlur '" + element.id +"'\n");
     74        Log.debug("awOnBlur '" + element.id + "'");
    7575        storage.updateVIdentityFromStorage(element);
    7676        storage.focusedElement = null;
     
    8383
    8484    awPopupOnCommand : function (element) {
    85         Log.debug("\nawPopupOnCommand'" + element.id +"'\n");
     85        Log.debug("awPopupOnCommand '" + element.id + "'");
    8686        storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2")));
    8787        if (element.selectedItem.getAttribute("value") == "addr_reply") // if reply-to is manually entered disable AutoReplyToSelf
     
    135135    updateVIdentityFromStorage: function(inputElement) {
    136136        if (!vI.vIprefs.get("storage"))
    137             { Log.debug("Storage deactivated\n"); return; }
    138         Log.debug("updateVIdentityFromStorage()\n");
     137            { Log.debug("Storage deactivated"); return; }
     138        Log.debug("updateVIdentityFromStorage()");
    139139
    140140        var recipientType = document.getElementById(inputElement.id.replace(/^addressCol2/,"addressCol1"))
     
    145145            if (storage.firstUsedInputElement == inputElement)
    146146                storage.firstUsedInputElement = null;
    147             Log.debug("field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n")
     147            Log.debug("field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.")
    148148            return;
    149149        }
    150150       
    151151        if (inputElement.value == "") {
    152             Log.debug("no recipient found, not checked.\n"); return;
     152            Log.debug("no recipient found, not checked."); return;
    153153        }
    154154       
    155155        var row = inputElement.id.replace(/^addressCol2#/,"")
    156156        if (storage.lastCheckedEmail[row] && storage.lastCheckedEmail[row] == inputElement.value) {
    157             Log.debug("same email than before, not checked again.\n"); return;
     157            Log.debug("same email than before, not checked again."); return;
    158158        }
    159159        storage.lastCheckedEmail[row] = inputElement.value;
     
    166166       
    167167        if (storageResult.identityCollection.number == 0) return; // return if there was no match
    168         Log.debug("updateVIdentityFromStorage result: " + storageResult.result + "\n");
     168        Log.debug("updateVIdentityFromStorage result: " + storageResult.result);
    169169        // found storageData, so store InputElement
    170170        if (!storage.firstUsedInputElement) storage.firstUsedInputElement = inputElement;
     
    173173        if (storageResult.result != "equal") {
    174174            for (var j = 0; j < storageResult.identityCollection.number; j++) {
    175                 Log.debug("updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n");
     175                Log.debug("updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName);
    176176                let menuItem = document.getElementById("virtualIdentityExtension_msgIdentityClone")
    177177                  .addIdentityToCloneMenu(storageResult.identityCollection.identityDataCollection[j])
     
    180180        }
    181181        if (storageResult.result == "accept") {
    182             Log.debug("updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n");
     182            Log.debug("updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName);
    183183            document.getElementById("virtualIdentityExtension_msgIdentityClone").selectedMenuItem = newMenuItem;
    184184            if (document.getElementById("virtualIdentityExtension_msgIdentityClone").vid)
     
    196196            if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
    197197                Log.debug("ignoring doBcc field '" +
    198                     doBccArray.StringAt(index) + "'.\n");
     198                    doBccArray.StringAt(index));
    199199                return true;
    200200            }
  • content/vI_upgrade.js

    reacce6 rfe0698  
    4949        var currentVersion = upgrade.rdfDatasource.getCurrentExtFileVersion();
    5050        Log.debug("checking for previous version, found " +
    51             currentVersion + "\nextension-upgrade required.\n")
     51            currentVersion + "... extension-upgrade required.")
    5252        switch (currentVersion) {
    5353            case null:
     
    5959        }
    6060        upgrade.rdfDatasource.storeExtVersion();
    61         Log.debug("extension-upgrade to " + upgrade.rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");
     61        Log.debug("extension-upgrade to " + upgrade.rdfDatasource.getCurrentExtFileVersion() + " done.");
    6262    },
    6363   
    6464    __removeExtraAddedHeaders : function(currentVersion) {
    65         Log.debug("extension-upgrade __removeExtraAddedHeaders " + currentVersion + "\n");
     65        Log.debug("extension-upgrade __removeExtraAddedHeaders " + currentVersion);
    6666        if ((!currentVersion || upgrade.versionChecker.compare(currentVersion, "0.6.9") < 0) &&
    6767                vI.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders") != "") {
    6868            // clean extraExpandedHeaders once, because the whole header-saving and restoring was broken too long
    69             Log.debug("cleaning extraExpandedHeaders\n");
     69            Log.debug("cleaning extraExpandedHeaders");
    7070            vI.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", "")
    71             Log.debug("cleaned extraExpandedHeaders\n");
     71            Log.debug("cleaned extraExpandedHeaders");
    7272        }
    73         Log.debug("extension-upgrade __removeExtraAddedHeaders done.\n\n");
     73        Log.debug("extension-upgrade __removeExtraAddedHeaders done.");
    7474    },
    7575   
     
    8888            if (!currentVersion || (upgrade.versionChecker.compare(currentVersion, transferPrefs[i].version) < 0)) {
    8989                // remove any obsolete preferences under extensions.virtualIdentity
    90                 Log.debug("transfer changed preferences of pre-" + transferPrefs[i].version + " release:\n")
     90                Log.debug("transfer changed preferences of pre-" + transferPrefs[i].version + " release...")
    9191                for each (transferPref in transferPrefs[i].prefs) {
    9292                    try {   vI.vIprefs.commit(transferPref.targetPref,
    9393                            vI.vIprefs.get(transferPref.sourcePref));
    9494                        vI.vIprefs.clearUserPref(transferPref.sourcePref);
    95                         Log.debug(".")
    9695                    }
    9796                    catch (e) { };
    9897                }
    99                 Log.debug("done.\n")
     98                Log.debug("done.")
    10099            }
    101100        }
     
    121120            if (!currentVersion || (upgrade.versionChecker.compare(currentVersion, obsoletePrefs[i].version) < 0)) {
    122121                // remove any obsolete preferences under extensions.virtualIdentity
    123                 Log.debug("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release:\n")
     122                Log.debug("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release...")
    124123                for each (pref in obsoletePrefs[i].prefs) {
    125124                    try { vI.vIprefs.clearUserPref(pref); Log.debug(".") }
    126125                    catch (e) { };
    127126                }
    128                 Log.debug("done.\n")
     127                Log.debug("done.")
    129128            }
    130129        }
  • content/v_identity.js

    reacce6 rfe0698  
    6666    ComposeStateListener : {
    6767        NotifyComposeBodyReady: function() {
    68             Log.debug("NotifyComposeBodyReady\n");
     68            Log.debug("NotifyComposeBodyReady");
    6969            main.initSystemStage2();
    7070        },
    7171        NotifyComposeFieldsReady: function() {
    72             Log.debug("NotifyComposeFieldsReady\n");
     72            Log.debug("NotifyComposeFieldsReady");
    7373        },
    7474        ComposeProcessDone: function(aResult) {
    75             Log.debug("StateListener reports ComposeProcessDone\n");
     75            Log.debug("StateListener reports ComposeProcessDone");
    7676            main.Cleanup(); // not really required, parallel handled by main.close
    7777            vI.storage.clean();
    7878        },
    7979        SaveInFolderDone: function(folderURI) {
    80             Log.debug("SaveInFolderDone\n");
     80            Log.debug("SaveInFolderDone");
    8181            main.Cleanup();
    8282            vI.storage.clean();
     
    8686    replacement_functions : {
    8787        FillIdentityList: function(menulist) {
    88             Log.debug("mod. FillIdentityList\n");
     88            Log.debug("mod. FillIdentityList");
    8989            var accounts = queryISupportsArray(main.accountManager.accounts,
    9090                                     Components.interfaces.nsIMsgAccount);
     
    138138            vI.storage.awOnBlur(vI.storage.focusedElement);
    139139
    140             Log.debug("\nVIdentity_GenericSendMessage\n");
     140            Log.debug("VIdentity_GenericSendMessage");
    141141           
    142142            if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now)
     
    151151            if (returnValue.update == "abort") {
    152152                main.replacement_functions.GenericSendMessageInProgress = false;
    153                 Log.debug("sending: --------------  aborted  ---------------------------------\n")
     153                Log.debug("sending: --------------  aborted  ---------------------------------")
    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  ---------------------------------")
    161161                    return;
    162162            }
     
    171171            else    main.Cleanup();
    172172            main.replacement_functions.GenericSendMessageInProgress = false;
    173             //          Log.debug("original_functions.GenericSendMessage done\n");
     173            //          Log.debug("original_functions.GenericSendMessage done");
    174174        },
    175175       
    176176        replace_FillIdentityList : function() {
    177             //~ Log.debug("replace FillIdentityList \n");
     177            //~ Log.debug("replace FillIdentityList");
    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("end. remove Account if there.\n")
     186        Log.debug("end. remove Account if there.")
    187187        main.Cleanup();
    188188        vI.storage.clean();
     
    209209            if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
    210210                Log.debug("_recipientIsDoBcc: ignoring doBcc field '" +
    211                     doBccArray.StringAt(index) + "'.\n");
     211                    doBccArray.StringAt(index));
    212212                return true;
    213213            }
     
    221221        window.removeEventListener('compose-window-init', main.init, true);
    222222        if (main.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen)
    223         Log.debug("\ninit.\n")
     223        Log.debug("init.")
    224224        main.unicodeConverter.charset="UTF-8";
    225         if (!main.adapt_genericSendMessage()) { Log.debug("\ninit failed.\n"); return; }
     225        if (!main.adapt_genericSendMessage()) { Log.error("init failed."); return; }
    226226       
    227227        main.adapt_interface();
     
    238238       
    239239        main.initSystemStage1();
    240         Log.debug("init done.\n\n")
     240        Log.debug("init done.")
    241241    },
    242242   
    243243    initSystemStage1 : function() {
    244         Log.debug("initSystemStage1.\n")
     244        Log.debug("initSystemStage1.")
    245245        main.gMsgCompose = gMsgCompose;
    246246        document.getElementById("virtualIdentityExtension_msgIdentityClone").init();
    247247        vI.statusmenu.init();
    248         Log.debug("initSystemStage1 done.\n")
     248        Log.debug("initSystemStage1 done.")
    249249    },
    250250   
    251251    initSystemStage2 : function() {
    252         Log.debug("initSystemStage2.\n")
     252        Log.debug("initSystemStage2.")
    253253        vI.initReplyTo();
    254254        vI.storage.init();
    255255        vI.smartIdentity.init();
    256         Log.debug("initSystemStage2 done.\n")
     256        Log.debug("initSystemStage2 done.")
    257257    },
    258258   
     
    290290    adapt_genericSendMessage : function() {
    291291        if (main.original_functions.GenericSendMessage) return true; // only initialize this once
    292         Log.debug("adapt GenericSendMessage\n");
     292        Log.debug("adapt GenericSendMessage");
    293293        main.original_functions.GenericSendMessage = GenericSendMessage;
    294294        GenericSendMessage = main.replacement_functions.GenericSendMessage;
     
    298298    reopen: function() {
    299299        vI.clearDebugOutput();
    300         Log.debug("composeDialog reopened. (msgType " + gMsgCompose.type + ")\n")
     300        Log.debug("composeDialog reopened. (msgType " + gMsgCompose.type + ")")
    301301       
    302302        // clean all elements
    303303        document.getElementById("virtualIdentityExtension_msgIdentityClone").clean();
    304         Log.debug("everything cleaned.\n")
     304        Log.debug("everything cleaned.")
    305305       
    306306        // now (re)init the elements
     
    331331                gMsgCompose.RegisterStateListener(main.ComposeStateListener);
    332332        }
    333         Log.debug("reopen done.\n")
     333        Log.debug("reopen done.")
    334334    },
    335335   
     
    388388        observe : function(subject, topic, data) {
    389389            if (topic == "am-smtpChanges") {
    390                 Log.debug("smtp changes observed\n");
     390                Log.debug("smtp changes observed");
    391391                var virtualIdentityExtension_msgIdentityClone = document.getElementById("virtualIdentityExtension_msgIdentityClone");
    392392                document.getAnonymousElementByAttribute(virtualIdentityExtension_msgIdentityClone, "class", "smtpServerListHbox").refresh();
    393393            }
    394394            if (topic == "am-acceptChanges") {
    395                 Log.debug("account changes observed\n");
     395                Log.debug("account changes observed");
    396396                document.getElementById("virtualIdentityExtension_msgIdentityClone").clean();
    397397                document.getElementById("virtualIdentityExtension_msgIdentityClone").init();
  • modules/plugins/conversations.js

    reacce6 rfe0698  
    5454
    5555let _changeIdentityToSmartIdentity = function(identityData) {
    56   Log.debug("changeIdentityToSmartIdentity\n");
     56  Log.debug("changeIdentityToSmartIdentity");
    5757 
    5858  if ( identityData.id.key != null ) {
     
    6262  }
    6363  virtualIdInUse = !(identityData.isExistingIdentity(false));
    64   Log.debug("changeIdentityToSmartIdentity virtualIdInUse=" + virtualIdInUse + "\n");
     64  Log.debug("changeIdentityToSmartIdentity virtualIdInUse=" + virtualIdInUse);
    6565  if (virtualIdInUse) {
    6666    currentIdentityData = identityData;
     
    9898      var existingIDIndex = localSmartIdentityCollection._foundExistingIdentity();
    9999      if (existingIDIndex) {
    100         Log.debug("smartIdentity: found existing Identity, use without interaction.\n", existingIDIndex.key);
     100        Log.debug("smartIdentity: found existing Identity, use without interaction.", existingIDIndex.key);
    101101        changeIdentityToSmartIdentity(localSmartIdentityCollection._allIdentities, existingIDIndex.key);
    102102        return;
     
    121121 
    122122  onMessageBeforeSendOrPopout_canceled: function _enigmailHook_onMessageBeforeSendOrPopout_canceledy(aAddress, aEditor, aStatus, aPopout) {
    123     Log.debug("onMessageBeforeSendOrPopout_canceled\n");
     123    Log.debug("onMessageBeforeSendOrPopout_canceled");
    124124    return aStatus;
    125125
    126126  },
    127127  onMessageBeforeSendOrPopout: function _enigmailHook_onMessageBeforeSendOrPopout(aAddress, aEditor, aStatus, aPopout) {
    128     Log.debug("onMessageBeforeSendOrPopout\n");
     128    Log.debug("onMessageBeforeSendOrPopout");
    129129    return aStatus;
    130130
     
    211211}
    212212catch(e) {
    213   Log.debug("virtualIdentity is ready for conversations, but you don't use it\n");
     213  Log.debug("virtualIdentity is ready for conversations, but you don't use it");
    214214}
  • modules/plugins/signatureSwitch.js

    reacce6 rfe0698  
    4242 
    4343  if (!existingIdentity) {
    44     Log.debug("signatureSwitch hide/remove signatures\n");
     44    Log.debug("signatureSwitch hide/remove signatures");
    4545   
    4646    // code to hide the text signature
     
    5454      var element = currentWindow.document.getElementById("menu_securitySign1");
    5555      if (element && element.getAttribute("checked") == "true") {
    56         Log.debug("signatureSwitch hide_sMime_messageSignature with doCommand\n");
     56        Log.debug("signatureSwitch hide_sMime_messageSignature with doCommand");
    5757        element.doCommand();
    5858      }
     
    7272        }
    7373        if (skipChangeGPGsign)
    74           Log.debug("signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
     74          Log.debug("signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open");
    7575        else {
    76           Log.debug("signatureSwitch hide_openPGP_messageSignature with doCommand\n");
     76          Log.debug("signatureSwitch hide_openPGP_messageSignature with doCommand");
    7777          element.doCommand();
    7878        }
     
    8181  }
    8282  else {
    83     Log.debug("signatureSwitch restore signature\n");
     83    Log.debug("signatureSwitch restore signature");
    8484    // code to show the text signature
    8585    if (ss_signature.length > 0) {
     
    9898    Log.debug("Virtual Identity plugin for signatureSwitch Extension loaded!");
    9999  else
    100     Log.debug("virtualIdentity is ready for signatureSwitch, but you don't use it\n");
     100    Log.debug("virtualIdentity is ready for signatureSwitch, but you don't use it");
    101101  });
  • modules/vI_account.js

    reacce6 rfe0698  
    4646            .getService(Ci.nsIMsgAccountManager);
    4747           
    48     Log.debug("\nprepareSendMsg " + msgType + " " + Ci.nsIMsgCompDeliverMode.Now + "\n");
     48    Log.debug("prepareSendMsg " + msgType + " " + Ci.nsIMsgCompDeliverMode.Now);
    4949   
    5050    returnValue = {};
     
    6363            var returnValue = localeDatasourceAccess.storeVIdentityToAllRecipients(identityData, recipients)
    6464            if ( returnValue.update == "abort" || returnValue.update == "takeover" ) {
    65                 Log.debug("prepareSendMsg: sending aborted\n");
     65                Log.debug("prepareSendMsg: sending aborted");
    6666                return returnValue;
    6767            }
    6868        }
    69         else Log.debug("prepareSendMsg: storage deactivated\n");
     69        else Log.debug("prepareSendMsg: storage deactivated");
    7070    }
    7171    if (vid) {
     
    8282    var currentIdentityData = new identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
    8383   
    84     Log.debug("\nSendMessage Final Check\n");
    85     Log.debug("currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
    86     Log.debug("virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
     84    Log.debug("SendMessage Final Check");
     85    Log.debug("currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'");
     86    Log.debug("virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'");
    8787
    8888    if  (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
     
    9292    }
    9393    else {
    94         if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) Log.error("\nfailed check for fullName.\n");
    95         if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) Log.error("\nfailed check for email.\n");
    96         if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) Log.error("\nfailed check for SMTP.\n");
     94        if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()))
     95          Log.error("failed check for fullName.");
     96        if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase()))
     97          Log.error("failed check for email.");
     98        if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp)))
     99          Log.error("failed check for SMTP.");
    97100        alert(stringBundle.GetStringFromName("vident.genericSendMessage.error"));
    98101        return false
     
    134137        if (vIprefs.get("copySMIMESettings")) {
    135138            // SMIME settings
    136             Log.debug("copy S/MIME settings\n")
     139            Log.debug("copy S/MIME settings")
    137140            account._copyUnicharAttribute("signing_cert_name");
    138141            account._copyUnicharAttribute("encryption_cert_name");
     
    142145        if (vIprefs.get("copyEnigmailSettings")) {
    143146            // pgp/enigmail settings
    144             Log.debug("copy PGP settings\n")
     147            Log.debug("copy PGP settings")
    145148            account._copyBoolAttribute("pgpSignEncrypted");
    146149            account._copyBoolAttribute("pgpSignPlain");
     
    155158        if (vIprefs.get("copyAttachVCardSettings")) {
    156159            // attach vcard
    157             Log.debug("copy VCard settings\n")
     160            Log.debug("copy VCard settings")
    158161            account._copyBoolAttribute("attachVCard");
    159162            account._copyCharAttribute("escapedVCard");
     
    179182
    180183    __cleanupDirectories : function() {
    181         Log.debug("checking for leftover VirtualIdentity directories ")
     184        Log.debug("checking for leftover VirtualIdentity directories ...")
    182185
    183186        var file = Cc["@mozilla.org/file/directory_service;1"]
     
    199202                        if (account.__dirEmpty(maildir)) {
    200203                            try {maildir.remove(true)} catch(e) { }
    201                             Log.debug("x");
    202204                        }
    203                         else Log.debug(".");
    204                        
    205205                    }
    206206                }
    207207            }
    208208        }
    209         Log.debug(" - done\n")
     209        Log.debug("done.")
    210210    },
    211211   
    212212    cleanupSystem : function() {
    213         Log.debug("checking for leftover VirtualIdentity accounts ")
     213        Log.debug("checking for leftover VirtualIdentity accounts ...")
    214214        for (var i=0; i < account._AccountManager.accounts.Count(); i++) {
    215215            var checkAccount = account._AccountManager.accounts.QueryElementAt(i, Ci.nsIMsgAccount);
    216216            if (account.__isVIdentityAccount(checkAccount)) {
    217                 Log.debug(".")
    218217                account.__removeAccount(checkAccount);
    219218            }
    220219        }
    221         Log.debug(" - done\n")
     220        Log.debug("done.")
    222221        account.__cleanupDirectories();
    223222    },
     
    234233   
    235234    __removeAccount : function(checkAccount) {
    236         Log.debug("__removeAccount\n")
     235        Log.debug("__removeAccount")
    237236        // in new (post 0.5.0) Virtual Identity accounts the incomingServer of the account
    238237        // points to an incoming server of a different account. Cause the internal
     
    250249       
    251250        var key = checkAccount.key;
    252         Log.debug("removing account " + key + ".\n")
     251        Log.debug("removing account " + key)
    253252        // remove the account
    254253        account._AccountManager.removeAccount(checkAccount);
     
    326325            + account._account.defaultIdentity.fullName + " email "
    327326            + account._account.defaultIdentity.email + " smtp "
    328             + account._account.defaultIdentity.smtpServerKey +")\n");
     327            + account._account.defaultIdentity.smtpServerKey +")");
    329328    },
    330329   
     
    335334          {
    336335              case "2"  :
    337               Log.debug ("preparing Fcc --- use Settings of Default Account\n");
     336              Log.debug ("preparing Fcc --- use Settings of Default Account");
    338337              account._account.defaultIdentity.doFcc = account._AccountManager.defaultAccount.defaultIdentity.doFcc;
    339338              account._account.defaultIdentity.fccFolder = account._AccountManager.defaultAccount.defaultIdentity.fccFolder;
     
    342341              break;
    343342              case "3"  :
    344               Log.debug ("preparing Fcc --- use Settings of Modified Account\n");
     343              Log.debug ("preparing Fcc --- use Settings of Modified Account");
    345344              account._account.defaultIdentity.doFcc = account._baseIdentity.doFcc;
    346345              account._account.defaultIdentity.fccFolder = account._baseIdentity.fccFolder;
     
    349348              break;
    350349              default  :
    351               Log.debug ("preparing Fcc --- use Virtual Identity Settings\n");
     350              Log.debug ("preparing Fcc --- use Virtual Identity Settings");
    352351              account._account.defaultIdentity.doFcc
    353352                  = vIprefs.get("doFcc");
     
    368367          account._account.defaultIdentity.fccFolder + " fccFolderPickerMode " +
    369368          account._account.defaultIdentity.fccFolderPickerMode + "(" +
    370           vIprefs.get("fccFolderPickerMode") + "))\n");
     369          vIprefs.get("fccFolderPickerMode") + "))");
    371370    },
    372371   
     
    375374        {
    376375            case "2"  :
    377             Log.debug ("preparing Draft --- use Settings of Default Account\n");
     376            Log.debug ("preparing Draft --- use Settings of Default Account");
    378377            account._account.defaultIdentity.draftFolder = account._AccountManager.defaultAccount.defaultIdentity.draftFolder;
    379378            account._account.defaultIdentity.draftsFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.draftsFolderPickerMode;
    380379            break;
    381380            case "3"  :
    382             Log.debug ("preparing Draft --- use Settings of Modified Account\n");
     381            Log.debug ("preparing Draft --- use Settings of Modified Account");
    383382            account._account.defaultIdentity.draftFolder = account._baseIdentity.draftFolder;
    384383            account._account.defaultIdentity.draftsFolderPickerMode = account._baseIdentity.draftsFolderPickerMode;
    385384            break;
    386385            default  :
    387             Log.debug ("preparing Draft --- use Virtual Identity Settings\n");
     386            Log.debug ("preparing Draft --- use Virtual Identity Settings");
    388387            account._account.defaultIdentity.draftFolder
    389388                = account._unicodeConverter.ConvertToUnicode(vIprefs.get("draftFolder"));
     
    395394            account._account.defaultIdentity.draftFolder + " draftsFolderPickerMode " +
    396395            account._account.defaultIdentity.draftsFolderPickerMode + "(" +
    397             vIprefs.get("draftFolderPickerMode") + "))\n");
     396            vIprefs.get("draftFolderPickerMode") + "))");
    398397    },
    399398   
     
    402401        {
    403402            case "2"  :
    404             Log.debug ("preparing Templates --- use Settings of Default Account\n");
     403            Log.debug ("preparing Templates --- use Settings of Default Account");
    405404            account._account.defaultIdentity.stationeryFolder = account._AccountManager.defaultAccount.defaultIdentity.stationeryFolder;
    406405            account._account.defaultIdentity.tmplFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.tmplFolderPickerMode;
    407406            break;
    408407            case "3"  :
    409             Log.debug ("preparing Templates --- use Settings of Modified Account\n");
     408            Log.debug ("preparing Templates --- use Settings of Modified Account");
    410409            account._account.defaultIdentity.stationeryFolder = account._baseIdentity.stationeryFolder;
    411410            account._account.defaultIdentity.tmplFolderPickerMode = account._baseIdentity.tmplFolderPickerMode;
    412411            break;
    413412            default  :
    414             Log.debug ("preparing Templates --- use Virtual Identity Settings\n");
     413            Log.debug ("preparing Templates --- use Virtual Identity Settings");
    415414            account._account.defaultIdentity.stationeryFolder
    416415                = account._unicodeConverter.ConvertToUnicode(vIprefs.get("stationeryFolder"));
     
    422421            account._account.defaultIdentity.stationeryFolder + " tmplFolderPickerMode " +
    423422            account._account.defaultIdentity.tmplFolderPickerMode + "(" +
    424             vIprefs.get("stationeryFolderPickerMode") + "))\n");
     423            vIprefs.get("stationeryFolderPickerMode") + "))");
    425424    }
    426425}
  • modules/vI_identityData.js

    reacce6 rfe0698  
    8181            this._fullName += RegExp.leftContext + RegExp.rightContext;
    8282            this._email = RegExp.lastMatch;
    83 //          Log.debug("parseEmail _fullName = '" + this._fullName + "'\n");
    84 //          Log.debug("parseEmail _email =    '" + this._email + "'\n");
     83//          Log.debug("parseEmail _fullName = '" + this._fullName + "'");
     84//          Log.debug("parseEmail _email =    '" + this._email + "'");
    8585        }
    8686        this._emailParsed = true;
     
    9393
    9494    cleanName : function(fullName) {
    95 //      Log.debug("cleanName init '" + fullName + "'\n");
     95//      Log.debug("cleanName init '" + fullName + "'");
    9696        var _fullName = fullName.replace(/^\s+|\s+$/g,"");
    9797        if (_fullName.search(/^\".+\"$|^'.+'$/g) != -1) {
    9898            _fullName = this.cleanName(_fullName.replace(/^\"(.+)\"$|^'(.+)'$/g,"$1$2"));
    9999        }
    100 //      Log.debug("cleanName done '" + _fullName + "'\n");
     100//      Log.debug("cleanName done '" + _fullName + "'");
    101101        return _fullName;
    102102    },
     
    143143    // dependent on MsgComposeCommands, should/will only be called in ComposeDialog
    144144    isExistingIdentity : function(ignoreFullNameWhileComparing) {
    145         Log.debug("isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n");
    146 //      Log.debug("base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n");
     145        Log.debug("isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'");
     146//      Log.debug("base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'");
    147147
    148148        var ignoreFullNameMatchKey = null;
     
    154154            for (let j = 0; j < account.identities.Count(); j++) {
    155155                var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
    156 //              Log.debug("comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'\n");
     156//              Log.debug("comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'");
    157157                var email = this.email?this.email:"";               // might be null if no identity is set
    158158                var idEmail = identity.email?identity.email:""; // might be null if no identity is set
     
    161161                        // if fullName matches, than this is a final match
    162162                        if ( this.fullName.toLowerCase() == identity.fullName.toLowerCase() ) {
    163                             Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'\n");
     163                            Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'");
    164164                            return identity.key; // return key and stop searching
    165165                        }
     
    171171
    172172        if ( ignoreFullNameWhileComparing && ignoreFullNameMatchKey ) {
    173             Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n");
     173            Log.debug("isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'");
    174174            return  ignoreFullNameMatchKey;
    175175        }
    176176
    177         Log.debug("isExistingIdentity: " + this.combinedName + " not found\n");
     177        Log.debug("isExistingIdentity: " + this.combinedName + " not found");
    178178        return null;
    179179    },
     
    248248
    249249    dropIdentity : function(index) {
    250         Log.debug("dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n");
     250        Log.debug("dropping address from inputList: " + this.identityDataCollection[index].combinedName);
    251251        while (index < (this.number - 1)) { this.identityDataCollection[index] = this.identityDataCollection[++index]; };
    252252        this.identityDataCollection[--this.number] = null;
     
    264264                    this.identityDataCollection[index].fullName = identityData.fullName;
    265265                    Log.debug("added fullName '" + identityData.fullName
    266                         + "' to stored email '" + this.identityDataCollection[index].email +"'\n")
     266                        + "' to stored email '" + this.identityDataCollection[index].email + "'")
    267267                }
    268268                // check if id_key, smtp_key or extras can be used
     
    273273                    this.identityDataCollection[index].extras = identityData.extras;
    274274                    Log.debug("added id '" + identityData.id.value
    275                         + "' smtp '" + identityData.smtp.value + "' (+extras) to stored email '" + this.identityDataCollection[index].email +"'\n")
     275                        + "' smtp '" + identityData.smtp.value + "' (+extras) to stored email '" + this.identityDataCollection[index].email + "'")
    276276                }
    277277                return;
    278278            }
    279279        }
    280         Log.debug("add new address to result: " + identityData.combinedName + "\n")
     280        Log.debug("add new address to result: " + identityData.combinedName)
    281281        this.identityDataCollection[index] = identityData;
    282282        this.number = index + 1;
  • modules/vI_identityDataExtras.js

    reacce6 rfe0698  
    205205        break;
    206206      default:
    207         Log.error("getValueFromEnvironment unknown window: " + id + "\n")
     207        Log.error("getValueFromEnvironment unknown window: " + id)
    208208    }
    209209  },
     
    222222        break;
    223223      default:
    224         Log.error("getValueFromEnvironment unknown window: " + id + "\n")
     224        Log.error("getValueFromEnvironment unknown window: " + id)
    225225    }
    226226  },
    227227  setValueToEnvironment_msgCompose : function() {
    228     Log.error("setValueToEnvironment not implemented for msgCompose and " + this.field + "\n")
     228    Log.error("setValueToEnvironment not implemented for msgCompose and " + this.field)
    229229  },
    230230  setValueToEnvironment_messenger : function() {
    231     Log.error("setValueToEnvironment not implemented for Messenger and " + this.field + "\n")
     231    Log.error("setValueToEnvironment not implemented for Messenger and " + this.field)
    232232  },
    233233  setValueToEnvironment_dataEditor : function() {
    234     Log.error("setValueToEnvironment not implemented for dataEditor and " + this.field + "\n")
     234    Log.error("setValueToEnvironment not implemented for dataEditor and " + this.field)
    235235  },
    236236  getValueFromEnvironment_msgCompose : function() {
    237     Log.error("setValueToEnvironment not implemented for msgCompose and " + this.field + "\n")
     237    Log.error("setValueToEnvironment not implemented for msgCompose and " + this.field)
    238238  },
    239239  getValueFromEnvironment_messenger : function() {
    240     Log.error("setValueToEnvironment not implemented for Messenger and " + this.field + "\n")
     240    Log.error("setValueToEnvironment not implemented for Messenger and " + this.field)
    241241  },
    242242  getValueFromEnvironment_dataEditor : function() {
    243     Log.error("setValueToEnvironment not implemented for dataEditor and " + this.field + "\n")
     243    Log.error("setValueToEnvironment not implemented for dataEditor and " + this.field)
    244244  }
    245245}
     
    267267    this.updateFunction_msgCompose();
    268268    if ((element.getAttribute("checked") == "true") != (this.value == "true")) {
    269       Log.debug("change "+ this.field + " to " + this.value + " with doCommand\n");
     269      Log.debug("change "+ this.field + " to " + this.value + " with doCommand");
    270270      element.doCommand();
    271271    }
  • modules/vI_log.js

    reacce6 rfe0698  
    4545  }
    4646};
    47 // Basic formatter that doesn't do anything fancy but does not add a newline
    48 function BasicFormatter() {}
    49 BasicFormatter.prototype = {
    50   __proto__: Log4Moz.Formatter.prototype,
    51   dateFormat : "%Y-%m-%d %H:%M:%S",
    52   format: function BF_format(message) {
    53     let date = new Date(message.time);
    54     // The trick below prevents errors further down because mo is null or
    55     //  undefined.
    56     let messageString = [
    57       ("" + mo) for each
    58       ([,mo] in Iterator(message.messageObjects))].join(" ");
    59     return date.toLocaleFormat(this.dateFormat) + "\t" +
    60       message.loggerName + "\t" + message.levelDesc + "\t" +
    61       messageString;
    62   }
    63 };
     47
    6448// New formatter that only display's the source and message
    6549function NewFormatter() {}
     
    7357      ("" + mo) for each
    7458      ([,mo] in Iterator(message.messageObjects))].join(" ");
    75     return message.loggerName.replace("virtualIdentity.", "") + ":\t" + messageString;
     59    return message.loggerName.replace("virtualIdentity.", "") + ":\t" + messageString  + "\n";
    7660  }
    7761};
     
    171155
    172156function setupFullLogging(name) {
    173   let myBasicFormatter = new BasicFormatter();
     157  let myBasicFormatter = new Log4Moz.BasicFormatter();
    174158  let myNewFormatter = new NewFormatter();
    175159  let Log = Log4Moz.repository.getLogger(name);
  • modules/vI_nameSpaceWrapper.js

    reacce6 rfe0698  
    1111
    1212virtualIdentityExtension.initTime = parseInt((new Date()).getTime());
    13 virtualIdentityExtension.Log.debug("init vI_overlayNameSpaceWrapper " + virtualIdentityExtension.initTime + "\n");
     13virtualIdentityExtension.Log.debug("init vI_overlayNameSpaceWrapper " + virtualIdentityExtension.initTime);
    1414
    1515(function() { this.ns = function(fn) { fn.apply({}); };  }).apply(virtualIdentityExtension);
     
    1818    // Shared APIs
    1919    getCurrentURI: function() {
    20       virtualIdentityExtension.Log.debug("getCurrentURI " + window.location.href + "\n");
     20      virtualIdentityExtension.Log.debug("getCurrentURI " + window.location.href);
    2121      return window.location.href;
    2222    },
  • modules/vI_prefs.js

    reacce6 rfe0698  
    5959          break;
    6060        case vIprefroot.PREF_INVALID:
    61           Log.error("_retrievePref pref '" + aPrefName + "' not available\n");
     61          Log.error("_retrievePref pref '" + aPrefName + "' not available");
    6262          this._localPrefs[aPrefName] = null;
    6363      }
     
    7676          break;
    7777        case vIprefroot.PREF_INVALID:
    78           Log.error("_storePref pref '" + aPrefName + "' not available\n");
     78          Log.error("_storePref pref '" + aPrefName + "' not available");
    7979      }
    8080    },
     
    8989        this._retrievePref(aPrefName);
    9090      this._localPrefs[aPrefName] = aPrefValue;
    91 //       Log.debug("changed pref " + aPrefName + " to " + aPrefValue + "\n")
     91//       Log.debug("changed pref " + aPrefName + " to " + aPrefValue)
    9292      for each (let [, prefObserver] in Iterator(this._localObservers)) {
    93 //         Log.debug("check prefobserver " + prefObserver.pref + " against " + aPrefName + "\n")
     93//         Log.debug("check prefobserver " + prefObserver.pref + " against " + aPrefName)
    9494        if (prefObserver.pref == aPrefName) {
    9595          prefObserver.observe(prefObserver.context, aPrefValue, "nsPref:changed", aPrefName);
     
    104104    },
    105105    clearUserPref: function(aPrefName) {
    106       Log.error(Colors.red, "XXXX not yet implemented clearUserPref!\n", Colors.default);
     106      Log.error(Colors.red, "XXXX not yet implemented clearUserPref!", Colors.default);
    107107    },
    108108    addObserver: function(aPrefName, aFunction, aSelf) {
    109109      this._localObservers.push({ pref: aPrefName, observe: aFunction, context: aSelf });
    110 //       Log.debug("added observer for " + aPrefName + "\n");
     110//       Log.debug("added observer for " + aPrefName);
    111111    },
    112112    removeObserver: function(aPrefName, aFunction) {
     
    119119    },
    120120    observe: function(subject, topic, aPrefName) {
    121       Log.debug("prefChange observed : " + aPrefName + "\n")
     121      Log.debug("prefChange observed : " + aPrefName)
    122122      this._retrievePref(aPrefName);
    123123      for each (let [, prefObserver] in Iterator(this._localObservers)) {
    124124        if (prefObserver.pref == aPrefName) {
    125 //           Log.debug("found observer, calling : " + prefObserver.observe + "\n")
     125//           Log.debug("found observer, calling : " + prefObserver.observe)
    126126          prefObserver.observe(prefObserver.context, subject, topic, aPrefName);
    127 //           Log.debug("found observer, calling : " + prefObserver.observe + " done\n")
     127//           Log.debug("found observer, calling : " + prefObserver.observe + " done")
    128128        }
    129129      }
  • modules/vI_rdfDatasource.js

    reacce6 rfe0698  
    9595
    9696    init: function() {
    97 //         Log.debug("init.\n");
     97//         Log.debug("init.");
    9898
    9999        this._openRdfDataSource();
     
    106106           
    107107//         this.refreshAccountInfo();
    108 //         Log.debug("init done.\n");
     108//         Log.debug("init done.");
    109109    },
    110110   
     
    124124        var fileURI = protoHandler.newFileURI(newFile);
    125125
    126         Log.debug("init: read rdf from '" + fileURI.spec + "'\n");
     126        Log.debug("init: read rdf from '" + fileURI.spec + "'");
    127127
    128128        this._rdfDataSource =
    129129            this._rdfService.GetDataSourceBlocking(fileURI.spec);
    130130           
    131 //         Log.debug("read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");
     131//         Log.debug("read rdf from '" + fileURI.spec + "' done." + this._rdfService);
    132132    },
    133133   
     
    174174        var currentVersion = this.getCurrentRDFFileVersion();
    175175        Log.debug("checking for previous version of rdf, found " +
    176             currentVersion + "\nrdf-upgrade required.\n")
     176            currentVersion + " - rdf-upgrade required.")
    177177        switch (currentVersion) {
    178178            case null:
     
    187187        }
    188188        this.storeRDFVersion();
    189         Log.debug("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.\n\n");
     189        Log.debug("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.");
    190190    },
    191191    // **************    RDF UPGRADE CODE    ****************************************************
    192192    // only used for upgrade to 0.0.3 - loop through all ressources.
    193193    _transferAllResources : function () {
    194         Log.debug("upgrade: transferAllResources ");
     194        Log.debug("upgrade: transferAllResources");
    195195        var enumerator = this._rdfDataSource.GetAllResources();
    196196        while (enumerator && enumerator.hasMoreElements()) {
     
    211211           
    212212            if (container.IndexOf(resource) == -1) container.AppendElement(resource);
    213        
    214             Log.debug(".");
    215         }
    216         Log.debug("\n");
     213        }
    217214    },
    218215    // **************    RDF UPGRADE CODE    ****************************************************
    219216    _tagDefaultSMTP: function() {
    220         Log.debug("upgrade: tagDefaultSMTP ");
     217        Log.debug("upgrade: tagDefaultSMTP");
    221218        for each (let treeType in Array("email", "maillist", "newsgroup", "filter")) {
    222219            var enumerator = this.getContainer(treeType).GetElements();
     
    226223                var smtp = this._getRDFValue(resource, "smtp")
    227224                if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
    228                 Log.debug(".");
    229             }
    230         }
    231         Log.debug("\n");
     225            }
     226        }
    232227    },
    233228    // **************    RDF UPGRADE CODE    ****************************************************
    234229    _createAccountInfoContainers: function() {
    235         Log.debug("upgrade: createAccountInfoContainers \n");
     230        Log.debug("upgrade: createAccountInfoContainers");
    236231        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
    237232            getService(Components.interfaces.nsIRDFContainerUtils);
     
    265260    // **************    RDF UPGRADE CODE    ****************************************************
    266261    _createRDFContainers: function() {
    267         Log.debug("upgrade: createRDFContainers ");
     262        Log.debug("upgrade: createRDFContainers");
    268263        var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
    269264            getService(Components.interfaces.nsIRDFContainerUtils);
     
    349344   
    350345    cleanAccountInfo : function() {
    351         Log.debug("cleanAccountInfo\n");
     346        Log.debug("cleanAccountInfo");
    352347       
    353348        var enumerator = this._identityContainer.GetElements();
     
    417412        }
    418413        if (mismatchIDs.length > 0) {
    419             Log.debug(" found mismatches on id(s).\n");
     414            Log.debug(" found mismatches on id(s).");
    420415            get3PaneWindow().openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0,
    421416                    "chrome, dialog, modal, alwaysRaised, resizable=yes", "identity", mismatchIDs,
     
    424419        }
    425420        else {
    426             Log.debug(" found no mismatch\n");
     421            Log.debug(" found no mismatch");
    427422            return false;
    428423        }
     
    432427        var keyField = (type == "identity")?"id":"smtp" // field to change is 'id' or 'smtp' dependent on type
    433428        for (var i = 0; i < mismatchItems.length; i++) {
    434             Log.debug("repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
     429            Log.debug("repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key);
    435430            // search relevant Identities
    436431            for each (let treeType in Array("email", "maillist", "newsgroup", "filter")) {
     
    442437                        if (mismatchItems[i].key == "") this._unsetRDFValue(resource, keyField, mismatchItems[i].oldkey)
    443438                        else this._setRDFValue(resource, keyField, mismatchItems[i].key)
    444                         Log.debug(".");
    445439                    }
    446440                }
    447441            }
    448             Log.debug("\n");
    449442        }
    450443    },
     
    492485        }
    493486        if (mismatchSMTPs.length > 0) {
    494             Log.debug(" found mismatches on smtp(s).\n");
     487            Log.debug(" found mismatches on smtp(s).");
    495488            get3PaneWindow().openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0,
    496489                    "chrome, dialog, modal, alwaysRaised, resizable=yes", "smtp", mismatchSMTPs,
     
    499492        }
    500493        else {
    501             Log.debug(" found no mismatch\n");
     494            Log.debug(" found no mismatch");
    502495            return false;
    503496        }
     
    505498
    506499    storeAccountInfo : function() {
    507         Log.debug("storeAccounts\n");
     500        Log.debug("storeAccounts");
    508501
    509502        var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
     
    513506            for (let j = 0; j < account.identities.Count(); j++) {
    514507                var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
    515 //                 Log.debug("storeAccounts identity store id " + identity.key + "\n");
     508//                 Log.debug("storeAccounts identity store id " + identity.key);
    516509
    517510                var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + identity.key);
     
    527520       
    528521        function storeSmtp(server, parent) {
    529 //             Log.debug("storeAccounts smtp store id " + server.key + "\n");
     522//             Log.debug("storeAccounts smtp store id " + server.key);
    530523            var resource = parent._rdfService.GetResource(parent._rdfNS + parent._rdfNSSMTPservers + "/" + server.key);
    531524            parent._setRDFValue(resource, "label", (server.description?server.description:server.hostname));
     
    544537        }
    545538
    546 //         Log.debug("storeAccounts done\n");
     539//         Log.debug("storeAccounts done");
    547540    },
    548541
     
    569562        if (!this._rdfDataSource) return null;
    570563        if (!recDescription) {
    571             Log.debug("_getRDFResourceForVIdentity: no Recipient given.\n");
     564            Log.debug("_getRDFResourceForVIdentity: no Recipient given.");
    572565            return null;
    573566        }
     
    585578   
    586579    removeVIdentityFromRDF : function (resource, recType) {
    587 //      Log.debug("removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
     580//      Log.debug("removeVIdentityFromRDF " + resource.ValueUTF8);
    588581        this._unsetRDFValue(resource, "email", this._getRDFValue(resource, "email"))
    589582        this._unsetRDFValue(resource, "fullName", this._getRDFValue(resource, "fullName"))
     
    602595   
    603596    _unsetRDFValue : function (resource, field, value) {
    604 //      Log.debug("_unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource + "\n");
     597//      Log.debug("_unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource);
    605598        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
    606599        var name = this._rdfService.GetLiteral(value?value:"");
     
    615608    // this will be used from rdfDataTree to get all RDF values, callFunction is vI.rdfDataTreeCollection.__addNewDatum
    616609    readAllEntriesFromRDF : function (addNewDatum, treeType, idData) {
    617 //      Log.debug("readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
     610//      Log.debug("readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this);
    618611        var enumerator = this.getContainer(treeType).GetElements();
    619612        while (enumerator && enumerator.hasMoreElements()) {
     
    635628        if (recipientType == "addr_newsgroups") return { recDesc : recipient, recType : "newsgroup" }
    636629        else if (this.__isMailingList(recipient)) {
    637             Log.debug("__getDescriptionAndType: '" + recipient + "' is MailList\n");
     630            Log.debug("__getDescriptionAndType: '" + recipient + "' is MailList");
    638631            return { recDesc : this.__getMailListName(recipient), recType : "maillist" }
    639632        }
    640633        else {
    641             Log.debug("__getDescriptionAndType: '" + recipient + "' is no MailList\n");
     634            Log.debug("__getDescriptionAndType: '" + recipient + "' is no MailList");
    642635            var localIdentityData = new identityData(recipient, null, null, null, null, null, null);
    643636            return { recDesc : localIdentityData.combinedName, recType : "email" }
     
    681674    findMatchingFilter : function (recipient, recipientType) {
    682675        var recDescription = this.__getDescriptionAndType(recipient, recipientType).recDesc;
    683         Log.debug("findMatchingFilter for " + recDescription + ".\n");
     676        Log.debug("findMatchingFilter for " + recDescription);
    684677        var enumerator = this._filterContainer.GetElements();
    685678        while (enumerator && enumerator.hasMoreElements()) {
     
    692685
    693686            if (filter == "") continue;
    694             if (/^\/(.*)\/$/.exec(filter))
    695                 { Log.debug("findMatchingFilter with RegExp '"
    696                     + filter.replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
    697             else    { Log.debug("findMatchingFilter, compare with '"
    698                     + filter + "'\n"); recentfilterType = filterType.StrCmp; }
     687            if (/^\/(.*)\/$/.exec(filter)) {
     688              Log.debug("findMatchingFilter with RegExp '" + filter.replace(/\\/g,"\\\\") + "'");
     689              recentfilterType = filterType.RegExp;
     690            }
     691            else {
     692              Log.debug("findMatchingFilter, compare with '" + filter + "'");
     693              recentfilterType = filterType.StrCmp;
     694            }
    699695           
    700696            switch (recentfilterType) {
     
    702698                    try {   /^\/(.*)\/$/.exec(filter);
    703699                        if (recDescription.match(new RegExp(RegExp.$1,"i"))) {
    704                             Log.debug("findMatchingFilter found stored data.\n");
     700                            Log.debug("findMatchingFilter found stored data.");
    705701                            return this._readVIdentityFromRDF(resource);
    706702                        }
     
    709705                case filterType.StrCmp:
    710706                    if (recDescription.toLowerCase().indexOf(filter.toLowerCase()) != -1) {
    711                         Log.debug("findMatchingFilter found stored data.\n");
     707                        Log.debug("findMatchingFilter found stored data.");
    712708                        return this._readVIdentityFromRDF(resource);
    713709                    }
     
    715711            }
    716712        }
    717         Log.debug("findMatchingFilter no match found.\n");
     713        Log.debug("findMatchingFilter no match found.");
    718714        return null;
    719715    },
     
    726722        if (!this._rdfDataSource.hasArcOut(resource, email)) {
    727723            // no data available --> give up.
    728             Log.debug("readVIdentityFromRDF no data found.\n");
     724            Log.debug("readVIdentityFromRDF no data found.");
    729725            return null;
    730726        }
    731         Log.debug("readVIdentityFromRDF found stored data.\n");
     727        Log.debug("readVIdentityFromRDF found stored data.");
    732728       
    733729        return this._readVIdentityFromRDF(resource);
     
    742738       
    743739        Log.debug("email='" + email +
    744             "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
     740            "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'");
    745741        let self = this;
    746742        var localIdentityData = new identityData(email, fullName, id, smtp, new identityDataExtras(self, resource))
     
    749745
    750746    _getRDFValue : function (resource, field) {
    751 //         Log.debug("_getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
     747//         Log.debug("_getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this);
    752748        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
    753749        var target = this._rdfDataSource.GetTarget(resource, predicate, true);
     
    772768
    773769    updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, storeSMTP, prevRecDescription, prevRecType) {
    774 //         Log.debug("(" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n");
     770//         Log.debug("(" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email);
    775771       
    776772//      if (!localIdentityData.email) {
    777 //          Log.debug("updateRDF: no Sender-email for Recipient, aborting.\n");
     773//          Log.debug("updateRDF: no Sender-email for Recipient, aborting.");
    778774//          return;
    779775//      }
     
    785781        var resource = this._getRDFResourceForVIdentity(prevRecDescription, prevRecType);
    786782        if (!resource) return;
    787 //      Log.debug("updateRDF " + resource.ValueUTF8 + ".\n");
     783//      Log.debug("updateRDF " + resource.ValueUTF8);
    788784       
    789785        var position = this.getContainer(recType).IndexOf(resource); // check for index in new recType
     
    807803            function (extra) {
    808804              extra.value = self._setRDFValue(resource, extra.field, extra.value) });
    809 //           Log.debug("extras: " + localIdentityData.extras.status() + "\n");
    810         }
    811        
    812 //      Log.debug("updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");
     805//           Log.debug("extras: " + localIdentityData.extras.status());
     806        }
     807       
     808//      Log.debug("updateRDF add " + resource.ValueUTF8 + " at position " + position);
    813809        if (position != -1) this.getContainer(recType).InsertElementAt(resource, position, true);
    814810        else this.getContainer(recType).AppendElement(resource);
     
    816812
    817813    _setRDFValue : function (resource, field, value) {
    818 //      Log.debug("_setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
     814//      Log.debug("_setRDFValue " + resource.ValueUTF8 + " " + field + " " + value);
    819815        if (!value) return value; // return if some value was not set.
    820 //      Log.debug("_setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");
     816//      Log.debug("_setRDFValue " + this._rdfService + " " + this._rdfDataSource);
    821817        var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
    822818        var name = this._rdfService.GetLiteral(value);
     
    834830        observe : function(subject, topic, data) {
    835831            if (topic == "am-smtpChanges" || topic == "am-acceptChanges") {
    836                 Log.debug("account/smtp changes observed\n");
     832                Log.debug("account/smtp changes observed");
    837833                this.searchIdentityMismatch();
    838834                this.searchSmtpMismatch();
     
    841837        },
    842838        register : function() {
    843             Log.debug("register AccountManagerObserver\n");
     839            Log.debug("register AccountManagerObserver");
    844840            var obsService = Components.classes["@mozilla.org/observer-service;1"].
    845841                getService(Components.interfaces.nsIObserverService)
     
    875871        var localIdentities = new identityCollection();
    876872        localIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipientName, recipientType));
    877         if (localIdentities.number == 1) Log.debug("using data from direct match\n");
     873        if (localIdentities.number == 1) Log.debug("using data from direct match");
    878874        localIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipientName, recipientType));
    879875       
    880876        var returnValue = {}; returnValue.identityCollection = localIdentities; returnValue.result = "drop";
    881877        if (localIdentities.number == 0) {
    882             Log.debug("updateVIdentityFromStorage no usable Storage-Data found.\n");
     878            Log.debug("updateVIdentityFromStorage no usable Storage-Data found.");
    883879        }
    884880        else {
    885             Log.debug("compare with current Identity\n");
     881            Log.debug("compare with current Identity");
    886882            if (vIprefs.get("storage_getOneOnly") &&        // if requested to retrieve only storageID for first recipient entered
    887883                isNotFirstInputElement &&                           // and it is now not the first recipient entered
     
    892888            // only update fields if new Identity is different than old one.
    893889            else {
    894                 Log.debug("updateVIdentityFromStorage check if storage-data matches current Identity.\n");
     890                Log.debug("updateVIdentityFromStorage check if storage-data matches current Identity.");
    895891                var compResult = localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, true);
    896892                if (!compResult.equal) {
     
    913909        var multipleRecipients = (recipients.length > 1);
    914910        var dontUpdateMultipleNoEqual = (vIprefs.get("storage_dont_update_multiple") && multipleRecipients)
    915         Log.debug("storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
     911        Log.debug("storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'")
    916912       
    917913        for (var j = 0; j < recipients.length; j++) {
     
    924920    getVIdentityFromAllRecipients : function(allIdentities, recipients) {
    925921        if (!vIprefs.get("storage"))
    926             { Log.debug("Storage deactivated\n"); return; }
     922            { Log.debug("Storage deactivated"); return; }
    927923        var initnumber = allIdentities.number;
    928924        for (var j = 0; j < recipients.length; j++) {
     
    930926            allIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipients[j].recipient, recipients[j].recipientType));
    931927        }
    932         Log.debug("found " + (allIdentities.number-initnumber) + " address(es)\n")
     928        Log.debug("found " + (allIdentities.number-initnumber) + " address(es)")
    933929    },
    934930
    935931    __updateStorageFromVIdentity : function(identityData, recipient, recipientType, dontUpdateMultipleNoEqual) {
    936         Log.debug("__updateStorageFromVIdentity.\n")
     932        Log.debug("__updateStorageFromVIdentity.")
    937933        var storageDataByType = this._rdfDataSource.readVIdentityFromRDF(recipient, recipientType);
    938934        var storageDataByFilter = this._rdfDataSource.findMatchingFilter(recipient, recipientType);
     
    947943        if (    (!storageDataByType && !storageDataByFilterEqual) ||
    948944            (!storageDataByTypeEqual && !storageDataByFilterEqual && !dontUpdateMultipleNoEqual) ) {
    949             Log.debug("__updateStorageFromVIdentity updating\n")
     945            Log.debug("__updateStorageFromVIdentity updating")
    950946            if (storageDataByType && !storageDataByTypeEqual && vIprefs.get("storage_warn_update")) {
    951                 Log.debug("__updateStorageFromVIdentity overwrite warning\n");
     947                Log.debug("__updateStorageFromVIdentity overwrite warning");
    952948                doUpdate = this.__askWarning(this.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
    953949            }
     
    10351031            values.id = values.id?values.id:"import_" + id
    10361032            relevantIDs[id] = values;
    1037             Log.debug("import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n");
     1033            Log.debug("import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'");
    10381034        }
    10391035        return relevantIDs;
     
    10671063            values.smtp = values.smtp?values.smtp:"import_" + smtp;
    10681064            relevantSMTPs[smtp] = values;
    1069             Log.debug("import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n");
     1065            Log.debug("import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'");
    10701066        }
    10711067        return relevantSMTPs;
     
    10971093       
    10981094        if (filePicker.show() == Components.interfaces.nsIFilePicker.returnOK) {
    1099             Log.debug("\nIMPORT\nimport: preparation:\n");
     1095            Log.debug("import: preparation:");
    11001096           
    11011097            var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"]
     
    11071103            filePicker.file.copyTo(importRdfDataFile.parent,importRdfDataFile.leafName);
    11081104
    1109             Log.debug("import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n");
     1105            Log.debug("import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'");
    11101106           
    11111107            // init Datasources
     
    11161112            var relevantSMTPs = this._translateRelevantSMTPs();
    11171113           
    1118             Log.debug("import: preparation done.\n");
    1119             Log.debug("import: starting import:\n");
    1120 
     1114            Log.debug("import: preparation done.");
     1115           
    11211116            for each (let treeType in Array("email", "maillist", "newsgroup", "filter")) {
    11221117                // re-initialize importDataSource to point rdfService to the right Resources
     
    11241119                var container = this._rdfImportDataSource.getContainer(treeType)
    11251120                if (container.GetCount() == 0) continue;
    1126                 Log.debug("importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n");
     1121                Log.debug("importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI);
    11271122                var enumerator = container.GetElements();
    11281123                // re-initialize dataSource to point rdfService to the right Resources
     
    11491144            }
    11501145           
    1151             Log.debug("import: removing temporary file " + importRdfDataFile.path + ".\n");
     1146            Log.debug("import: removing temporary file " + importRdfDataFile.path);
    11521147            this._rdfImportDataSource = null; importRdfDataFile.remove(false);
    1153             Log.debug("import: import done.\n");
    1154            
    1155             Log.debug("import: cleaning ID/SMTP storages:\n");
     1148            Log.debug("import: import done.");
     1149           
     1150            Log.debug("import: cleaning ID/SMTP storages:");
    11561151            this._rdfDataSource = new rdfDatasource(this._rdfFileName, true);
    11571152           
     
    11641159            this._rdfDataSource.clean();
    11651160            this._rdfDataSource = null;
    1166             Log.debug("import: cleaning ID/SMTP storages done.\n");
    1167             Log.debug("IMPORT DONE.\n");
     1161            Log.debug("import: cleaning ID/SMTP storages done.");
     1162            Log.debug("IMPORT DONE.");
    11681163        }
    11691164    }
  • modules/vI_replyToSelf.js

    reacce6 rfe0698  
    4444      var awType = currentWindow.awGetPopupElement(row).selectedItem.getAttribute("value");
    4545      if (awType == "addr_reply") {
    46         Log.debug("removed ReplyTo found in row " + row + "\n");
     46        Log.debug("removed ReplyTo found in row " + row);
    4747        currentWindow.awDeleteRow(row--); // removed one line therefore decrease row-value
    4848      }
  • modules/vI_smartIdentityCollection.js

    reacce6 rfe0698  
    6464    // this function adds a timestamp to the current sender
    6565    __autoTimestamp : function() {
    66         Log.debug("__autoTimestamp()\n");
     66        Log.debug("__autoTimestamp()");
    6767        if (this._IDisVID) {
    68             Log.debug("Virtual Identity in use, aborting\n");
     68            Log.debug("Virtual Identity in use, aborting");
    6969            return;
    7070        }
     
    7474        var domain = current_email[1];
    7575       
    76         Log.debug("current email: " + current_email[0] + "@" + current_email[1] + "\n");
     76        Log.debug("current email: " + current_email[0] + "@" + current_email[1]);
    7777       
    7878        var autoString = vIprefs.get("autoString");
     
    8686       
    8787        var new_email = autoString.replace(/%l/g, localpart).replace(/%d/g, domain).replace(/%t/g,dateString);
    88         Log.debug("new email: " + new_email + "\n");
     88        Log.debug("new email: " + new_email);
    8989
    9090        var newIdentity = new identityData(new_email,
     
    9696   
    9797    __ignoreID : function() {
    98         Log.debug("checking " + vIprefs.get("idSelection_ignoreIDs") + " against " + this._preselectedID.key + "\n")
     98        Log.debug("checking " + vIprefs.get("idSelection_ignoreIDs") + " against " + this._preselectedID.key )
    9999        // check if usage if virtual Identities should be used at all for the currently selected ID
    100100        if (vIprefs.get("idSelection_ignoreIDs").indexOf(":" + this._preselectedID.key + ":") != -1) {
    101             Log.debug("not using virtual Identites for ID " + this._preselectedID.key + "\n");
     101            Log.debug("not using virtual Identites for ID " + this._preselectedID.key);
    102102            return true;
    103103        }
     
    106106   
    107107    NewMail : function() {
    108         Log.debug("NewMail()\n");
     108        Log.debug("NewMail()");
    109109        if (this.__ignoreID()) return;
    110110        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
     
    120120                // reorder list of Identities to prefer it on autoselect
    121121                // has to be done before Identities are added to the Menu
    122                 Log.debug("found existing Identity, reorder to prefer this one.\n");
     122                Log.debug("found existing Identity, reorder to prefer this one.");
    123123                var firstIdentity = this._allIdentities.identityDataCollection[index];
    124124                for (var i = index; index > 0; index--) {
     
    133133   
    134134    ReplyOnSent : function() {
    135         Log.debug("ReplyOnSent() (rules like SmartDraft)\n");
     135        Log.debug("ReplyOnSent() (rules like SmartDraft)");
    136136        this.__SmartDraftOrReplyOnSent();
    137137        this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients);
     
    139139
    140140    Draft : function() {
    141         Log.debug("Draft()\n");
     141        Log.debug("Draft()");
    142142       
    143143        this.__SmartDraftOrReplyOnSent();
     
    158158    __SmartDraftOrReplyOnSent : function() {
    159159        if (!vIprefs.get("smart_draft"))
    160             { Log.debug("SmartDraft deactivated\n"); return; }
    161 
    162         Log.debug("__SmartDraftOrReplyOnSent()\n");
     160            { Log.debug("SmartDraft deactivated"); return; }
     161
     162        Log.debug("__SmartDraftOrReplyOnSent()");
    163163
    164164        if (this._msgHdr) {
    165165            this.__parseHeadersWithArray(this._msgHdr.author, this._allIdentities)
    166             Log.debug("sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'\n");
    167         }
    168         else Log.debug("__SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
     166            Log.debug("sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'");
     167        }
     168        else Log.debug("__SmartDraftOrReplyOnSent: No Header found, shouldn't happen");
    169169    },
    170170   
     
    179179            const filterType = { None : 0, RegExp : 1, StrCmp : 2 }
    180180            var recentfilterType; var skipRegExp = false;
    181             if (filterList.length <= 1 && filterList[0] == "")
    182                 { Log.debug("no filters configured\n"); recentfilterType = filterType.None; }
    183             else if (/^[+-]?\/(.*)\/$/.exec(filterList[i]))
    184                 { Log.debug("filter emails with RegExp '"
    185                     + filterList[i].replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
    186             else    { Log.debug("filter emails, compare with '"
    187                     + filterList[i] + "'\n"); recentfilterType = filterType.StrCmp; }
     181            if (filterList.length <= 1 && filterList[0] == "") {
     182              Log.debug("no filters configured");
     183              recentfilterType = filterType.None;
     184            }
     185            else if (/^[+-]?\/(.*)\/$/.exec(filterList[i])) {
     186              Log.debug("filter emails with RegExp '" + filterList[i].replace(/\\/g,"\\\\") + "'");
     187              recentfilterType = filterType.RegExp;
     188            }
     189            else {
     190              Log.debug("filter emails, compare with '" + filterList[i] + "'");
     191              recentfilterType = filterType.StrCmp;
     192            }
    188193            for (var j = 0; j < this._allIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in
    189194            // copied and adapted from correctIdentity, thank you for the RegExp-idea!
     
    242247            // if mailing-list ignore to-header (usually the mailing list address)
    243248            if (replyHeaderNameToRead == "to" && this._msgHdr.getStringProperty("vI_list-id")) {
    244                 Log.debug("header 'list-id' found (mailinglist), skipping header 'to'\n");
     249                Log.debug("header 'list-id' found (mailinglist), skipping header 'to'");
    245250                continue;
    246251            }
     
    253258           
    254259            Log.debug("found stored header '" +
    255                 replyHeaderNameToRead + "': '" + window3pane.virtualIdentityExtension.storedHeaders["vI_" + replyHeaderNameToRead] + "'\n");*/
     260                replyHeaderNameToRead + "': '" + window3pane.virtualIdentityExtension.storedHeaders["vI_" + replyHeaderNameToRead] + "'");*/
    256261           
    257262            Log.debug("reading header '" +
    258                 replyHeaderNameToRead + "': '" + value + "'\n");
     263                replyHeaderNameToRead + "': '" + value + "'");
    259264           
    260265            // ------------- parse address-string to get a field of single email-addresses
     
    267272                if (!splitted.identityDataCollection[i].email.match(/^.*@.*$/)) {
    268273                    Log.debug("  skipping '" +
    269                     splitted.identityDataCollection[i].email + "', no email\n")
     274                    splitted.identityDataCollection[i].email + "', no email")
    270275                    continue;
    271276                }
     
    276281
    277282                Log.debug("  found '" +
    278                     splitted.identityDataCollection[i].combinedName + "'\n")
     283                    splitted.identityDataCollection[i].combinedName + "'")
    279284            }
    280285        }
     
    282287   
    283288    Reply : function() {
    284         Log.debug("Reply()\n");
     289        Log.debug("Reply()");
    285290
    286291        if (this._msgHdr && this._newsgroup && !this._msgHdr.getStringProperty("vI_content_base")) {
     
    296301            if (vIprefs.get("smart_detectByReceivedHeader")) {
    297302                if (!this._msgHdr.getStringProperty("vI_received")) { // mail was not received
    298                     Log.debug("reply on non-received (sent?) mail. Using SmartDraft. \n");
     303                    Log.debug("reply on non-received (sent?) mail. Using SmartDraft.");
    299304                    this.ReplyOnSent();
    300305                    return;
     
    307312
    308313                if (this._msgHdr && (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_SENTMAIL)) {
    309                     Log.debug("reply from Sent folder.");
    310314                    if (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_INBOX)
    311                         Log.debug(" Folder is INBOX, assuming Reply-Case. \n");
     315                        Log.debug("reply from Sent folder. Folder is INBOX, assuming Reply-Case.");
    312316                    else {
    313                         Log.debug(" Using SmartDraft. \n");
     317                        Log.debug("reply from Sent folder. Using SmartDraft.");
    314318                        this.ReplyOnSent();
    315319                        return;
     
    326330        if (storageIdentities.number == 0 || !vIprefs.get("idSelection_storage_ignore_smart_reply"))
    327331            this.__SmartReply();
    328         else Log.debug("SmartReply skipped, Identities in Storage found.\n");
     332        else Log.debug("SmartReply skipped, Identities in Storage found.");
    329333
    330334        // merge SmartReply-Identities and Storage-Identites
     
    337341        }
    338342       
    339         Log.debug("merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left\n")
     343        Log.debug("merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left")
    340344    },
    341345   
     
    343347    __SmartReply : function() {
    344348        if (!vIprefs.get("smart_reply"))
    345             { Log.debug("SmartReply deactivated\n"); return; }
     349            { Log.debug("SmartReply deactivated"); return; }
    346350        if (this._newsgroup && !vIprefs.get("smart_reply_for_newsgroups")) {
    347             Log.debug("SmartReply, answering to a newsgroup, aborting\n");
     351            Log.debug("SmartReply, answering to a newsgroup, aborting");
    348352            return;
    349353        }
    350354
    351         Log.debug("__SmartReply()\n");
    352         Log.debug("----------------------------------------------------------\n")
     355        Log.debug("__SmartReply()");
     356        Log.debug("----------------------------------------------------------")
    353357        if (this._msgHdr) {
    354358            /* first step: collect addresses */
    355359            this.__smartReplyCollectAddresses();
    356             Log.debug("" + this._allIdentities.number + " address(es) after parsing, before filtering\n")
     360            Log.debug("" + this._allIdentities.number + " address(es) after parsing, before filtering")
    357361           
    358362            /* second step: filter (and sort) addresses */
    359363            this.__filterAddresses();
    360364           
    361             Log.debug("filtering done, " + this._allIdentities.number + " address(es) left\n")
     365            Log.debug("filtering done, " + this._allIdentities.number + " address(es) left")
    362366           
    363367            /* set default FullName */
     
    368372                        this._allIdentities.identityDataCollection[index].fullName = smart_reply_defaultFullName
    369373                        Log.debug("added default FullName '" +
    370                             smart_reply_defaultFullName + "' to '" + this._allIdentities.identityDataCollection[index].email + "'\n")
     374                            smart_reply_defaultFullName + "' to '" + this._allIdentities.identityDataCollection[index].email + "'")
    371375                    }
    372376                }
     
    377381            /* will not be added to the menu but probably choosen with __smartIdentitySelection     */
    378382            if (vIprefs.get("smart_reply_ignoreFullName")) {
    379                 Log.debug("compare with existing Identities (ignoring FullNames).\n")
     383                Log.debug("compare with existing Identities (ignoring FullNames).")
    380384           
    381385                for (var index = 0; index < this._allIdentities.number; index++) {
     
    384388                        var newFullName = gAccountManager.getIdentity(idKey).fullName;
    385389                        this._allIdentities.identityDataCollection[index].fullName = newFullName;
    386                         Log.debug("replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
     390                        Log.debug("replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "'");
    387391                    }
    388392                }
    389393            }
    390394        }
    391         else Log.debug("SmartReply skipped. No Header-information found.\n");
    392        
    393         Log.debug("----------------------------------------------------------\n")
     395        else Log.debug("SmartReply skipped. No Header-information found.");
     396       
     397        Log.debug("----------------------------------------------------------")
    394398    },
    395399   
Note: See TracChangeset for help on using the changeset viewer.