Changeset 825513


Ignore:
Timestamp:
Sep 17, 2008, 2:08:53 AM (13 years ago)
Author:
rene <rene@…>
Branches:
lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9
Children:
317c0c
Parents:
1c8ec4
Message:

collection of changes to 0.6 branch

Location:
chrome/content/v_identity
Files:
9 edited

Legend:

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

    r1c8ec4 r825513  
    106106
    107107    __cleanupDirectories : function() {
     108        vI_notificationBar.dump("## vI_account: checking for leftover VirtualIdentity directories ")
     109
    108110        var file = Components.classes["@mozilla.org/file/directory_service;1"]
    109111        .getService(Components.interfaces.nsIProperties)
     
    132134            }
    133135        }
    134         vI_notificationBar.dump("\n")
     136        vI_notificationBar.dump(" - done\n")
    135137    },
    136138   
    137139    cleanupSystem : function() {
    138         vI_notificationBar.dump("## vI_account: cleanupSystem:\n")
    139140        vI_notificationBar.dump("## vI_account: checking for leftover VirtualIdentity accounts ")
    140141        for (var i=0; i < vI_account.AccountManager.accounts.Count(); i++) {
     
    145146            }
    146147        }
    147         vI_notificationBar.dump("\n## vI_account: checking for leftover VirtualIdentity directories ")
     148        vI_notificationBar.dump(" - done\n")
    148149        vI_account.__cleanupDirectories();
    149        
    150         vI_notificationBar.dump("## vI_account: cleanupSystem done.\n")
    151150    },
    152151   
  • chrome/content/v_identity/vI_getHeader.js

    r1c8ec4 r825513  
    7171    getHeader: function() {
    7272        vI_notificationBar.clear_dump()
    73         vI_notificationBar.dump("## vI_getHeader: onEndHeaders\n")
    7473        var index;
    7574
     
    107106            if (currentHeadersCounter[headerName]) currentHeadersCounter[headerName]++
    108107            else currentHeadersCounter[headerName] = 1
    109             vI_notificationBar.dump("## vI_getHeader: found header: " + headerName +
    110                     "[:" + currentHeadersCounter[headerName] + "]");
    111108           
    112109            for (var index = 0; index < vI_getHeader.headerToSearch.length; index++) {
     
    123120                    storedValue = hdr.getProperty(vI_getHeader.headerToSearch[index].headerNameToStore)
    124121                    storedConvValue = vI_getHeader.unicodeConverter.ConvertToUnicode(storedValue)
    125                     vI_notificationBar.dump(" ...stored as '" + storedConvValue + "'");
     122                    vI_notificationBar.dump("## vI_getHeader: found header: " + headerName +
     123                        "[:" + currentHeadersCounter[headerName] + "] - stored as '" +
     124                        storedConvValue + "'\n");
    126125                    if (!found) {
    127126                        subtitle = vI_getHeader.strings.getString("vident.getHeader.headerFound");
     
    134133                }
    135134            }
    136             vI_notificationBar.dump("\n");
    137135        }
    138136        vI_notificationBar.setNote(label, "get_header_notification", subtitle);
     
    183181   
    184182    init : function() {
    185         vI_notificationBar.dump("## vI_prepareHeader: init\n");
    186183        if (vI_prepareHeader.addExtraHeader()) vI_prepareHeader.addObserver();
    187184    },
    188185   
    189186    cleanup : function() {
    190         vI_notificationBar.dump("## vI_prepareHeader: cleanup\n");
    191187        vI_prepareHeader.removeObserver();
    192188        vI_prepareHeader.removeExtraHeader();
     
    198194        vI_prepareHeader.prefroot.addObserver("extensions.virtualIdentity.smart_reply_headers", this, false);
    199195        vI_prepareHeader.observer_added = true;
    200         vI_notificationBar.dump("## vI_prepareHeader: prefs observer added\n");
    201196    },
    202197   
     
    204199        if (!vI_prepareHeader.observer_added) return;
    205200        vI_prepareHeader.prefroot.removeObserver("extensions.virtualIdentity.smart_reply_headers", this);
    206         vI_notificationBar.dump("## vI_prepareHeader: prefs observer removed\n");
    207201        vI_prepareHeader.observer_added = false;
    208202    },
     
    210204    // this is a adapted copy of enigEnsureExtraHeaders() from enigmail, thanks
    211205    addExtraHeader : function() {
    212         vI_notificationBar.dump("## vI_prepareHeader: addExtraHeader\n");
    213206        vI_prepareHeader.unicodeConverter.charset = "UTF-8";
    214207        var header_list = vI_prepareHeader.unicodeConverter.ConvertToUnicode(vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_headers")).split(/\n/)
     
    230223                for (var j = 0; j < gCollapsedHeaderList.length; j++) {
    231224                    if (gCollapsedHeaderList[j].name == headerToSearch) {
    232                         vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gCollapsedHeaderList\n");
     225//                      vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gCollapsedHeaderList\n");
    233226                        found = true; break;
    234227                    }
     
    238231                for (var j = 0; j < gExpandedHeaderList.length; j++) {
    239232                    if (gExpandedHeaderList[j].name == headerToSearch) {
    240                         vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gExpandedHeaderList\n");
     233//                      vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gExpandedHeaderList\n");
    241234                        found = true; break;
    242235                    }
     
    248241                    (addedHeadersString.indexOf(" " + headerToSearch + " ") < 0))
    249242                    vI_prepareHeader.addedHeaders.push(headerToSearch);
    250                 else vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' already in extraExpandedHeaders\n");
     243//              else vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' already in extraExpandedHeaders\n");
    251244            }
    252245           
     
    255248                extraHdrs = extraHdrs.replace(/^\s+|\s+$/g,"")
    256249                vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs)
    257             }
    258             vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + vI_prepareHeader.addedHeaders.join(" ") + "' added\n");
    259            
    260            
    261             vI_notificationBar.dump("## vI_prepareHeader: done\n");
     250                vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + vI_prepareHeader.addedHeaders.join(" ") + "' added\n");
     251            }       
     252
    262253            return true;
    263254        }
  • chrome/content/v_identity/vI_helper.js

    r1c8ec4 r825513  
    129129            name = name.replace(/^\'|\'$/g,"")
    130130        }
    131         vI_notificationBar.dump("## v_identity: getAddress: address '" + address + "' name '" +
    132             name + "' email '" + email + "'\n");
    133131        return { name: name,
    134132             email: email,
  • chrome/content/v_identity/vI_msgIdentityCloneTools.js

    r1c8ec4 r825513  
    2525var vI_msgIdentityCloneTools = {   
    2626    copySelectedIdentity : function(id_key) {
     27        vI_notificationBar.dump("## vI_msgIdentityCloneTools: copySelectedIdentity\n");
    2728        var msgIdentityElem = document.getElementById("msgIdentity");
    2829        var msgIdentityPopupElem = document.getElementById("msgIdentityPopup");
    29         vI_notificationBar.dump("## vI_msgIdentityCloneTools: copySelectedIdentity\n");
    3030        // copy selected Menu-Value from clone to orig.
    3131        var MenuItems = msgIdentityPopupElem.childNodes
     
    3737            }
    3838        }
    39         vI_notificationBar.dump("## vI_msgIdentityCloneTools: copySelectedIdentity MsgIdentityPopup.doCommand()\n");
    4039        msgIdentityPopupElem.doCommand();
    4140    },
     
    7473    // searches the first reply-to row and assumes that this is the one we like to adapt
    7574    initReplyToFields : function(id) {
    76         vI_notificationBar.dump("## vI_msgIdentityCloneTools: initReplyToFields id=" + id + "\n");
     75//      vI_notificationBar.dump("## vI_msgIdentityCloneTools: initReplyToFields id=" + id + "\n");
    7776        var replyTo = gAccountManager.getIdentity(id).replyTo
    78        
    79         vI_notificationBar.dump("## vI_msgIdentityCloneTools: initReplyToFields identity.replyTo: " + replyTo + "\n");
    8077        if (replyTo == "") return
    8178       
     
    8582            var awValue = awGetInputElement(row).value
    8683            if (awType == "addr_reply" && awValue == replyTo) {
    87                 vI_notificationBar.dump("## vI_msgIdentityCloneTools: initReplyToFields Reply-To found in row " + row + "\n");
     84                vI_notificationBar.dump("## vI_msgIdentityCloneTools: initReplyToFields identity.replyTo: " + replyTo + " found in row " + row + "\n");
    8885                vI_msgIdentityCloneTools.replyToPopupElem = awGetPopupElement(row)
    8986                vI_msgIdentityCloneTools.replyToInputElem = awGetInputElement(row)
     
    9188            }
    9289        }
    93         if (!vI_msgIdentityCloneTools.replyToInputElem) vI_notificationBar.dump("## vI_msgIdentityCloneTools: initReplyToFields no Reply-To row found\n");
    9490    },
    9591   
  • chrome/content/v_identity/vI_notificationBar.js

    r1c8ec4 r825513  
    193193    __setTitle: function(title) {
    194194        if (!title) return;
    195         vI_notificationBar.dump("** setTitle: " + title + "\n");
     195//      vI_notificationBar.dump("** setTitle: " + title + "\n");
    196196        var Obj_vINotificationTitle = document.getElementById("vINotificationTitle");
    197197        Obj_vINotificationTitle.setAttribute("value", title);
     
    200200
    201201    addNote: function(note, prefstring, title) {
    202         vI_notificationBar.dump("** " + note + "\n");
     202//      vI_notificationBar.dump("** " + note + "\n\n");
    203203        if (!vI_notificationBar.preferences.getBoolPref(prefstring)) return;
    204204        if (!vI_notificationBar.Obj_vINotification) vI_notificationBar.init();
  • chrome/content/v_identity/vI_rdfDatasource.js

    r1c8ec4 r825513  
    121121            return null;
    122122        }
    123         vI_notificationBar.dump("## vI_rdfDatasource: __getRDFResourceForVIdentity: recDescription=" + parsed.combinedName + "\n")
    124123        var rdfNSRecType = null
    125124        switch (recType) {
     
    179178   
    180179    readVIdentityFromRDF : function (recDescription, recType) {
    181         vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF.\n");
    182180        var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
    183181        if (!resource) return null;
     
    195193        var smtp = vI_rdfDatasource.__getRDFValue(resource, "smtp")
    196194       
    197         vI_notificationBar.dump("## vI_rdfDatasource: email '" + email + "'\n");
    198         vI_notificationBar.dump("## vI_rdfDatasource: fullName '" + fullName + "'\n");
    199         vI_notificationBar.dump("## vI_rdfDatasource: id '" + id + "'\n");
    200         vI_notificationBar.dump("## vI_rdfDatasource: smtp '" + smtp + "'\n");
     195        vI_notificationBar.dump("## vI_rdfDatasource: email='" + email +
     196            "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
    201197       
    202198        var extras = new vI_storageExtras(vI_rdfDatasource.__getRDFValue, resource);
    203         vI_notificationBar.dump("## vI_rdfDatasource: extras: " + extras.status() + "\n");
     199        vI_notificationBar.dump("## vI_rdfDatasource: extras:" + extras.status() + "\n");
    204200       
    205201        var localIdentityData = new identityData(email, fullName, id, smtp, extras)
  • chrome/content/v_identity/vI_storage.js

    r1c8ec4 r825513  
    9898
    9999    isExistingIdentity : function() {
    100         vI_notificationBar.dump("## vI_storage: isExistingIdentity\n");
    101100        var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
    102101        for (var i in accounts) {
     
    109108                    (this.email == identities[j].email) &&
    110109                    this.__equalSMTP(identities[j].smtpServerKey)   ) {
    111                     vI_notificationBar.dump("## vI_storage: existing Identity found: " + identities[j].key + "\n");
     110                    vI_notificationBar.dump("## vI_storage: isExistingIdentity: " + this.combinedName + " found, id='" + identities[j].key + "'\n");
    112111                    return identities[j].key;
    113112                }
    114113            }
    115114        }
    116         vI_notificationBar.dump("## vI_storage: none existing Identity found.\n");
     115        vI_notificationBar.dump("## vI_storage: isExistingIdentity: " + this.combinedName + " not found\n");
    117116        return null;
    118117    },
     
    230229            }
    231230        }
    232         vI_notificationBar.dump("## identityCollection:   add new address to result:" + identityData.combinedName + "\n")
     231        vI_notificationBar.dump("## identityCollection:   add new address to result: " + identityData.combinedName + "\n")
    233232        this.identityDataCollection[index] = identityData;
    234233        this.number = index + 1;
     
    279278        // only react on events triggered by addressCol2 - textinput Elements
    280279        if (!element || ! element.id.match(/^addressCol2*/)) return;
    281         vI_notificationBar.dump("## vI_storage: awOnBlur '" + element.id +"'\n");
     280        vI_notificationBar.dump("\n## vI_storage: awOnBlur '" + element.id +"'\n");
    282281        vI_storage.updateVIdentityFromStorage(element);
    283282    },
    284283
    285284    awPopupOnCommand : function (element) {
    286         vI_notificationBar.dump("## vI_storage: awPopupOnCommand'" + element.id +"'\n");
     285        vI_notificationBar.dump("\n## vI_storage: awPopupOnCommand'" + element.id +"'\n");
    287286        vI_storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2")))
    288287    },
     
    509508    // see also https://bugzilla.mozilla.org/show_bug.cgi?id=408575
    510509    isMailingList: function(recipient) {
    511         vI_notificationBar.dump("## vI_storage: isMailingList '" + recipient + "' \n")
    512510        var queryString = "?(or(DisplayName,c," + encodeURIComponent(vI_storage.getMailListName(recipient)) + "))"
    513511        var returnVar = vI_storage._walkTroughCards(queryString, vI_storage._isMailingListCard,
    514512            { mailListName : recipient, isMailList : false } )
    515         vI_notificationBar.dump("## vI_storage: isMailList  " + returnVar.isMailList + ".\n")
    516513        return returnVar.isMailList;
    517514    }, 
  • chrome/content/v_identity/v_identity.js

    r1c8ec4 r825513  
    136136            var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
    137137                .getService(Components.interfaces.nsIPromptService);
    138             vI_notificationBar.dump("## v_identity: VIdentity_GenericSendMessage\n");
     138            vI_notificationBar.dump("\n## v_identity: VIdentity_GenericSendMessage\n");
    139139           
    140140            var vid = document.getElementById("msgIdentity_clone").vid
     
    202202        window.removeEventListener('compose-window-init', vI.init, true);
    203203        if (vI.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen)
    204         vI_notificationBar.dump("## v_identity: init.\n")
     204        vI_notificationBar.dump("\n## v_identity: init.\n")
    205205        vI.unicodeConverter.charset="UTF-8";
    206206        vI.adapt_interface();
     
    210210        window.addEventListener('compose-window-close', vI.close, true);
    211211        vI.initSystemStage1();
    212         vI_notificationBar.dump("## v_identity: init done.\n")
     212        vI_notificationBar.dump("## v_identity: init done.\n\n")
    213213    },
    214214   
  • chrome/content/v_identity/v_identity.xml

    r1c8ec4 r825513  
    294294    <method name="command">
    295295        <body><![CDATA[
     296        vI_notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")
    296297        this.identityData = this.selectedMenuItem.identityData.getDuplicate();
    297298        // clean reply-to fields before reinit
     
    429430    <method name="inputEvent">
    430431            <body><![CDATA[     
     432        vI_notificationBar.dump("\n** v_identity.xml inputEvent\n")
     433       
    431434        this.identityData.combinedName = this.label;
    432435        this.label = this.identityData.combinedName; // reset to possibly changed value
Note: See TracChangeset for help on using the changeset viewer.