Changeset 021dbf
- Timestamp:
- Nov 14, 2011, 6:08:39 PM (9 years ago)
- Branches:
- ng_0.9
- Children:
- c0a8de
- Parents:
- 67fe6b
- Files:
-
- 2 added
- 2 deleted
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
content/bindings/vI_rdfAccountMismatchDialog.xml
r67fe6b r021dbf 155 155 <method name="_addIdentities"> 156 156 <body><![CDATA[ 157 virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: _addIdentities.\n");157 MyLog.debug("## mismatchID-menupopup: _addIdentities.\n"); 158 158 var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"] 159 159 .getService(Components.interfaces.nsIMsgAccountManager); … … 177 177 <parameter name="server" /> 178 178 <body><![CDATA[ 179 virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: _addSmtp.\n");179 MyLog.debug("## mismatchID-menupopup: _addSmtp.\n"); 180 180 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; 181 181 var menuitem = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem … … 190 190 <method name="_addSmtpServers"> 191 191 <body><![CDATA[ 192 virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: _addSmtpServers.\n");192 MyLog.debug("## mismatchID-menupopup: _addSmtpServers.\n"); 193 193 194 194 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; … … 209 209 <constructor> 210 210 <![CDATA[ 211 virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: constructor.\n");211 MyLog.debug("## mismatchID-menupopup: constructor.\n"); 212 212 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; 213 213 this.appendChild(document.createElementNS(XUL_NS, "menuseparator")); // create a new XUL menuseparator -
content/bindings/v_identity.xml
r67fe6b r021dbf 75 75 <method name="popupshowing"> 76 76 <body><![CDATA[ 77 virtualIdentityExtension.notificationBar.dump("** v_identity.xml vI_tooltipPopupset popupshowing.\n")77 MyLog.debug("** v_identity.xml vI_tooltipPopupset popupshowing.\n") 78 78 if (!this._identityInfo) { 79 79 this._identityInfo = … … 85 85 "</td>" + 86 86 "</tr></table>" 87 virtualIdentityExtension.notificationBar.dump("** v_identity.xml added tooltip with id='" + this.elem.identityData.id.key + "'\n")87 MyLog.debug("** v_identity.xml added tooltip with id='" + this.elem.identityData.id.key + "'\n") 88 88 this._tooltipBrowser.outputString = this._identityInfo; 89 89 } 90 virtualIdentityExtension.notificationBar.dump("** v_identity.xml vI_tooltipPopupset popupshowing done.\n")90 MyLog.debug("** v_identity.xml vI_tooltipPopupset popupshowing done.\n") 91 91 ]]></body> 92 92 </method> … … 130 130 this.label = this._identityDataStorage.combinedName; 131 131 this.value = this._identityDataStorage.id.key; 132 virtualIdentityExtension.notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n")132 MyLog.debug("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n") 133 133 134 134 this.description = this._identityDataStorage.sideDescription; 135 135 this.smtp = this._identityDataStorage.smtp.value; 136 virtualIdentityExtension.notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")136 MyLog.debug("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n") 137 137 this.smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;"; 138 138 this._identityDataStorage.smtp.value; … … 248 248 <setter><![CDATA[ 249 249 if (val == virtualIdentityExtension.NO_SMTP_TAG) return; // dont overwrite if not set 250 virtualIdentityExtension.notificationBar.dump("** v_identity.xml smtp set to '" + val + "'\n")250 MyLog.debug("** v_identity.xml smtp set to '" + val + "'\n") 251 251 var MenuItems = this._smtpPopup.childNodes 252 252 for (var index = 0; index < MenuItems.length; index++) { … … 349 349 <method name="command"> 350 350 <body><![CDATA[ 351 virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")352 virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")351 MyLog.debug("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n") 352 MyLog.debug("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n") 353 353 // copy selected Menu-Value from clone to orig. 354 virtualIdentityExtension.notificationBar.dump("** v_identity.xmlcopy selected Menu-Value from clone to orig. Searching for id=" + this.selectedMenuItem.identityData.id.key + " \n")354 MyLog.debug("** v_identity.xmlcopy selected Menu-Value from clone to orig. Searching for id=" + this.selectedMenuItem.identityData.id.key + " \n") 355 355 if ( this.selectedMenuItem.identityData.id.key != null ) { 356 356 var MenuItems = this._msgIdentityPopupElem.childNodes … … 365 365 } 366 366 this.identityData = this.selectedMenuItem.identityData.getDuplicate(); 367 virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() this.value=" + this.value + "\n");367 MyLog.debug("\n** v_identity.xml msgIdentityCloneElem.doCommand() this.value=" + this.value + "\n"); 368 368 // if current SMTP is empty, take the one from current Identity 369 369 if (this.identityData.smtp.hasNoDefinedSMTP()) { … … 498 498 <getter><![CDATA[ 499 499 if (!this._msgIdentityElem.selectedItem) { 500 virtualIdentityExtension.notificationBar.dump("** v_identity.xml: msgIdentityElem.selectedItem not set, using first Menuitem\n");500 MyLog.debug("** v_identity.xml: msgIdentityElem.selectedItem not set, using first Menuitem\n"); 501 501 this._msgIdentityElem.selectedItem = this._msgIdentityPopupElem.firstChild 502 virtualIdentityExtension.notificationBar.dump("** v_identity.xml: msgIdentityElem.doCommand()\n");502 MyLog.debug("** v_identity.xml: msgIdentityElem.doCommand()\n"); 503 503 this._msgIdentityElem.doCommand(); 504 504 } … … 508 508 <method name="blurEvent"> 509 509 <body><![CDATA[ 510 virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml blurEvent")510 MyLog.debug("\n** v_identity.xml blurEvent") 511 511 this.inputEvent(); // timeout might prevent inputEvent to fire before blurEvent 512 512 … … 517 517 <method name="inputEvent"> 518 518 <body><![CDATA[ 519 virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml inputEvent\n")519 MyLog.debug("\n** v_identity.xml inputEvent\n") 520 520 521 521 this.identityData.combinedName = this.label; … … 527 527 <method name="checkForVirtualIdentity"> 528 528 <body><![CDATA[ 529 virtualIdentityExtension.notificationBar.dump("** v_identity.xml checkForVirtualIdentity: " + this.identityData.id.key + " '" + this.identityData.id.value + "'\n")529 MyLog.debug("** v_identity.xml checkForVirtualIdentity: " + this.identityData.id.key + " '" + this.identityData.id.value + "'\n") 530 530 var existingIdentity = this.identityData.isExistingIdentity(false); 531 531 … … 553 553 ]]></getter> 554 554 <setter><![CDATA[ 555 virtualIdentityExtension.notificationBar.dump("** v_identity.xml identityData setter\n")555 MyLog.debug("** v_identity.xml identityData setter\n") 556 556 if (!val) this._identityDataStorage = null 557 557 else { … … 559 559 this._identityDataStorage = val; 560 560 if (oldIdentityData) { // indicates that it's not first time after clean 561 virtualIdentityExtension.notificationBar.dump("** v_identity.xml previousID: fullName='" + oldIdentityData.fullName + "' email='" + oldIdentityData.email + "' smtp='" + oldIdentityData.smtp.key + "' id='" + oldIdentityData.id.key + "' existingID='" + oldIdentityData.existingID + "'\n");562 virtualIdentityExtension.notificationBar.dump("** 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");561 MyLog.debug("** v_identity.xml previousID: fullName='" + oldIdentityData.fullName + "' email='" + oldIdentityData.email + "' smtp='" + oldIdentityData.smtp.key + "' id='" + oldIdentityData.id.key + "' existingID='" + oldIdentityData.existingID + "'\n"); 562 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 563 if (!this._identityDataStorage.existingID && !this._identityDataStorage.combinedName) 564 564 this._identityDataStorage.fullName = oldIdentityData.fullName; … … 577 577 this.description = this._identityDataStorage.sideDescription; 578 578 document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp.keyNice; 579 virtualIdentityExtension.notificationBar.dump("** 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");580 } 581 virtualIdentityExtension.notificationBar.dump("** v_identity.xml identityData setter done.'\n")579 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"); 580 } 581 MyLog.debug("** v_identity.xml identityData setter done.'\n") 582 582 ]]></setter> 583 583 </property> -
content/modules/vI_account.js
r67fe6b r021dbf 39 39 .getService(Components.interfaces.nsIMsgAccountManager); 40 40 41 if (vI.notificationBar) vI.notificationBar.dump("\n## prepareSendMsg " + msgType + " " + Components.interfaces.nsIMsgCompDeliverMode.Now + "\n");41 MyLog.debug("\n## prepareSendMsg " + msgType + " " + Components.interfaces.nsIMsgCompDeliverMode.Now + "\n"); 42 42 43 43 returnValue = {}; … … 57 57 var returnValue = localeDatasourceAccess.storeVIdentityToAllRecipients(identityData, recipients) 58 58 if ( returnValue.update == "abort" || returnValue.update == "takeover" ) { 59 if (vI.notificationBar) vI.notificationBar.dump("## prepareSendMsg: sending aborted\n");59 MyLog.debug("## prepareSendMsg: sending aborted\n"); 60 60 return returnValue; 61 61 } 62 62 } 63 else if (vI.notificationBar) vI.notificationBar.dump("## prepareSendMsg: storage deactivated\n");63 else MyLog.debug("## prepareSendMsg: storage deactivated\n"); 64 64 } 65 65 if (vid) { … … 76 76 var currentIdentityData = new vI.identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null); 77 77 78 if (vI.notificationBar) vI.notificationBar.dump("\n## vI.identityData SendMessage Final Check\n");79 if (vI.notificationBar) vI.notificationBar.dump("## vI.identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");80 if (vI.notificationBar) vI.notificationBar.dump("## vI.identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");78 MyLog.debug("\n## vI.identityData SendMessage Final Check\n"); 79 MyLog.debug("## vI.identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n"); 80 MyLog.debug("## vI.identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n"); 81 81 82 82 if (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase() && … … 86 86 } 87 87 else { 88 if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for fullName.\n");89 if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for email.\n");90 if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) vI.notificationBar.dump("\n## vI.identityData failed check for SMTP.\n");88 if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) MyLog.debug("\n## vI.identityData failed check for fullName.\n"); 89 if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) MyLog.debug("\n## vI.identityData failed check for email.\n"); 90 if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) MyLog.debug("\n## vI.identityData failed check for SMTP.\n"); 91 91 alert(stringBundle.getStringFromName("vident.genericSendMessage.error")); 92 92 return false … … 136 136 if (account._pref.getBoolPref("copySMIMESettings")) { 137 137 // SMIME settings 138 vI.notificationBar.dump("## account: copy S/MIME settings\n")138 MyLog.debug("## account: copy S/MIME settings\n") 139 139 account._copyUnicharAttribute("signing_cert_name"); 140 140 account._copyUnicharAttribute("encryption_cert_name"); … … 144 144 if (account._pref.getBoolPref("copyEnigmailSettings")) { 145 145 // pgp/enigmail settings 146 vI.notificationBar.dump("## account: copy PGP settings\n")146 MyLog.debug("## account: copy PGP settings\n") 147 147 account._copyBoolAttribute("pgpSignEncrypted"); 148 148 account._copyBoolAttribute("pgpSignPlain"); … … 157 157 if (account._pref.getBoolPref("copyAttachVCardSettings")) { 158 158 // attach vcard 159 vI.notificationBar.dump("## account: copy VCard settings\n")159 MyLog.debug("## account: copy VCard settings\n") 160 160 account._copyBoolAttribute("attachVCard"); 161 161 account._copyCharAttribute("escapedVCard"); … … 181 181 182 182 __cleanupDirectories : function() { 183 vI.notificationBar.dump("## account: checking for leftover VirtualIdentity directories ")183 MyLog.debug("## account: checking for leftover VirtualIdentity directories ") 184 184 185 185 var file = Components.classes["@mozilla.org/file/directory_service;1"] … … 201 201 if (account.__dirEmpty(maildir)) { 202 202 try {maildir.remove(true)} catch(e) { } 203 vI.notificationBar.dump("x");203 MyLog.debug("x"); 204 204 } 205 else vI.notificationBar.dump(".");205 else MyLog.debug("."); 206 206 207 207 } … … 209 209 } 210 210 } 211 vI.notificationBar.dump(" - done\n")211 MyLog.debug(" - done\n") 212 212 }, 213 213 214 214 cleanupSystem : function() { 215 vI.notificationBar.dump("## account: checking for leftover VirtualIdentity accounts ")215 MyLog.debug("## account: checking for leftover VirtualIdentity accounts ") 216 216 for (var i=0; i < account._AccountManager.accounts.Count(); i++) { 217 217 var checkAccount = account._AccountManager.accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount); 218 218 if (account.__isVIdentityAccount(checkAccount)) { 219 vI.notificationBar.dump(".")219 MyLog.debug(".") 220 220 account.__removeAccount(checkAccount); 221 221 } 222 222 } 223 vI.notificationBar.dump(" - done\n")223 MyLog.debug(" - done\n") 224 224 account.__cleanupDirectories(); 225 225 }, … … 236 236 237 237 __removeAccount : function(checkAccount) { 238 vI.notificationBar.dump("## account: __removeAccount\n")238 MyLog.debug("## account: __removeAccount\n") 239 239 // in new (post 0.5.0) Virtual Identity accounts the incomingServer of the account 240 240 // points to an incoming server of a different account. Cause the internal … … 252 252 253 253 var key = checkAccount.key; 254 vI.notificationBar.dump("## account: removing account " + key + ".\n")254 MyLog.debug("## account: removing account " + key + ".\n") 255 255 // remove the account 256 256 account._AccountManager.removeAccount(checkAccount); … … 325 325 account._account.defaultIdentity.smtpServerKey = baseIdentity.smtpServerKey; 326 326 327 vI.notificationBar.dump("## account: Stored virtualIdentity (name "327 MyLog.debug("## account: Stored virtualIdentity (name " 328 328 + account._account.defaultIdentity.fullName + " email " 329 329 + account._account.defaultIdentity.email + " smtp " … … 341 341 { 342 342 case "2" : 343 vI.notificationBar.dump("## account: preparing Fcc --- use Settings of Default Account\n");343 MyLog.debug ("## account: preparing Fcc --- use Settings of Default Account\n"); 344 344 account._account.defaultIdentity.doFcc = account._AccountManager.defaultAccount.defaultIdentity.doFcc; 345 345 account._account.defaultIdentity.fccFolder = account._AccountManager.defaultAccount.defaultIdentity.fccFolder; … … 348 348 break; 349 349 case "3" : 350 vI.notificationBar.dump("## account: preparing Fcc --- use Settings of Modified Account\n");350 MyLog.debug ("## account: preparing Fcc --- use Settings of Modified Account\n"); 351 351 account._account.defaultIdentity.doFcc = account._baseIdentity.doFcc; 352 352 account._account.defaultIdentity.fccFolder = account._baseIdentity.fccFolder; … … 355 355 break; 356 356 default : 357 vI.notificationBar.dump("## account: preparing Fcc --- use Virtual Identity Settings\n");357 MyLog.debug ("## account: preparing Fcc --- use Virtual Identity Settings\n"); 358 358 account._account.defaultIdentity.doFcc 359 359 = account._pref.getBoolPref("doFcc"); … … 371 371 account._account.defaultIdentity.doFcc = false; 372 372 } 373 vI.notificationBar.dump("## account: Stored (doFcc " + account._account.defaultIdentity.doFcc + " fccFolder " +373 MyLog.debug("## account: Stored (doFcc " + account._account.defaultIdentity.doFcc + " fccFolder " + 374 374 account._account.defaultIdentity.fccFolder + " fccFolderPickerMode " + 375 375 account._account.defaultIdentity.fccFolderPickerMode + "(" + … … 381 381 { 382 382 case "2" : 383 vI.notificationBar.dump("## account: preparing Draft --- use Settings of Default Account\n");383 MyLog.debug ("## account: preparing Draft --- use Settings of Default Account\n"); 384 384 account._account.defaultIdentity.draftFolder = account._AccountManager.defaultAccount.defaultIdentity.draftFolder; 385 385 account._account.defaultIdentity.draftsFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.draftsFolderPickerMode; 386 386 break; 387 387 case "3" : 388 vI.notificationBar.dump("## account: preparing Draft --- use Settings of Modified Account\n");388 MyLog.debug ("## account: preparing Draft --- use Settings of Modified Account\n"); 389 389 account._account.defaultIdentity.draftFolder = account._baseIdentity.draftFolder; 390 390 account._account.defaultIdentity.draftsFolderPickerMode = account._baseIdentity.draftsFolderPickerMode; 391 391 break; 392 392 default : 393 vI.notificationBar.dump("## account: preparing Draft --- use Virtual Identity Settings\n");393 MyLog.debug ("## account: preparing Draft --- use Virtual Identity Settings\n"); 394 394 account._account.defaultIdentity.draftFolder 395 395 = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("draftFolder")); … … 398 398 break; 399 399 } 400 vI.notificationBar.dump("## account: Stored (draftFolder " +400 MyLog.debug("## account: Stored (draftFolder " + 401 401 account._account.defaultIdentity.draftFolder + " draftsFolderPickerMode " + 402 402 account._account.defaultIdentity.draftsFolderPickerMode + "(" + … … 408 408 { 409 409 case "2" : 410 vI.notificationBar.dump("## account: preparing Templates --- use Settings of Default Account\n");410 MyLog.debug ("## account: preparing Templates --- use Settings of Default Account\n"); 411 411 account._account.defaultIdentity.stationeryFolder = account._AccountManager.defaultAccount.defaultIdentity.stationeryFolder; 412 412 account._account.defaultIdentity.tmplFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.tmplFolderPickerMode; 413 413 break; 414 414 case "3" : 415 vI.notificationBar.dump("## account: preparing Templates --- use Settings of Modified Account\n");415 MyLog.debug ("## account: preparing Templates --- use Settings of Modified Account\n"); 416 416 account._account.defaultIdentity.stationeryFolder = account._baseIdentity.stationeryFolder; 417 417 account._account.defaultIdentity.tmplFolderPickerMode = account._baseIdentity.tmplFolderPickerMode; 418 418 break; 419 419 default : 420 vI.notificationBar.dump("## account: preparing Templates --- use Virtual Identity Settings\n");420 MyLog.debug ("## account: preparing Templates --- use Virtual Identity Settings\n"); 421 421 account._account.defaultIdentity.stationeryFolder 422 422 = account._unicodeConverter.ConvertToUnicode(account._pref.getCharPref("stationeryFolder")); … … 425 425 break; 426 426 } 427 vI.notificationBar.dump("## account: Stored (stationeryFolder " +427 MyLog.debug("## account: Stored (stationeryFolder " + 428 428 account._account.defaultIdentity.stationeryFolder + " tmplFolderPickerMode " + 429 429 account._account.defaultIdentity.tmplFolderPickerMode + "(" + -
content/modules/vI_identityData.js
r67fe6b r021dbf 70 70 this._fullName += RegExp.leftContext + RegExp.rightContext; 71 71 this._email = RegExp.lastMatch; 72 // vI.notificationBar.dump("## identityData: parseEmail _fullName = '" + this._fullName + "'\n");73 // vI.notificationBar.dump("## identityData: parseEmail _email = '" + this._email + "'\n");72 // MyLog.debug("## identityData: parseEmail _fullName = '" + this._fullName + "'\n"); 73 // MyLog.debug("## identityData: parseEmail _email = '" + this._email + "'\n"); 74 74 } 75 75 this._emailParsed = true; … … 82 82 83 83 cleanName : function(fullName) { 84 // vI.notificationBar.dump("## identityData: cleanName init '" + fullName + "'\n");84 // MyLog.debug("## identityData: cleanName init '" + fullName + "'\n"); 85 85 var _fullName = fullName.replace(/^\s+|\s+$/g,""); 86 86 if (_fullName.search(/^\".+\"$|^'.+'$/g) != -1) { 87 87 _fullName = this.cleanName(_fullName.replace(/^\"(.+)\"$|^'(.+)'$/g,"$1$2")); 88 88 } 89 // vI.notificationBar.dump("## identityData: cleanName done '" + _fullName + "'\n");89 // MyLog.debug("## identityData: cleanName done '" + _fullName + "'\n"); 90 90 return _fullName; 91 91 }, … … 132 132 // dependent on MsgComposeCommands, should/will only be called in ComposeDialog 133 133 isExistingIdentity : function(ignoreFullNameWhileComparing) { 134 vI.notificationBar.dump("## identityData: isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n");135 // vI.notificationBar.dump("## identityData base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n");134 MyLog.debug("## identityData: isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n"); 135 // MyLog.debug("## identityData base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n"); 136 136 137 137 var ignoreFullNameMatchKey = null; … … 143 143 for (let j = 0; j < account.identities.Count(); j++) { 144 144 var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity); 145 // vI.notificationBar.dump("## identityData comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'\n");145 // MyLog.debug("## identityData comp: fullName.toLowerCase()='" + identity.fullName.toLowerCase() + "' email.toLowerCase()='" + identity.email.toLowerCase() + "' smtp='" + identity.smtpServerKey + "'\n"); 146 146 var email = this.email?this.email:""; // might be null if no identity is set 147 147 var idEmail = identity.email?identity.email:""; // might be null if no identity is set … … 150 150 // if fullName matches, than this is a final match 151 151 if ( this.fullName.toLowerCase() == identity.fullName.toLowerCase() ) { 152 vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'\n");152 MyLog.debug("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identity.key + "'\n"); 153 153 return identity.key; // return key and stop searching 154 154 } … … 160 160 161 161 if ( ignoreFullNameWhileComparing && ignoreFullNameMatchKey ) { 162 vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n");162 MyLog.debug("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n"); 163 163 return ignoreFullNameMatchKey; 164 164 } 165 165 166 vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " not found\n");166 MyLog.debug("## identityData: isExistingIdentity: " + this.combinedName + " not found\n"); 167 167 return null; 168 168 }, … … 239 239 240 240 dropIdentity : function(index) { 241 vI.notificationBar.dump("## identityCollection: dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n");241 MyLog.debug("## identityCollection: dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n"); 242 242 while (index < (this.number - 1)) { this.identityDataCollection[index] = this.identityDataCollection[++index]; }; 243 243 this.identityDataCollection[--this.number] = null; … … 254 254 if (this.identityDataCollection[index].fullName == "" && identityData.fullName != "") { 255 255 this.identityDataCollection[index].fullName = identityData.fullName; 256 vI.notificationBar.dump("## identityCollection: added fullName '" + identityData.fullName256 MyLog.debug("## identityCollection: added fullName '" + identityData.fullName 257 257 + "' to stored email '" + this.identityDataCollection[index].email +"'\n") 258 258 } … … 263 263 this.identityDataCollection[index].smtp.key = identityData.smtp.key; 264 264 this.identityDataCollection[index].extras = identityData.extras; 265 vI.notificationBar.dump("## identityCollection: added id '" + identityData.id.value265 MyLog.debug("## identityCollection: added id '" + identityData.id.value 266 266 + "' smtp '" + identityData.smtp.value + "' (+extras) to stored email '" + this.identityDataCollection[index].email +"'\n") 267 267 } … … 269 269 } 270 270 } 271 vI.notificationBar.dump("## identityCollection: add new address to result: " + identityData.combinedName + "\n")271 MyLog.debug("## identityCollection: add new address to result: " + identityData.combinedName + "\n") 272 272 this.identityDataCollection[index] = identityData; 273 273 this.number = index + 1; -
content/modules/vI_rdfDatasource.js
r67fe6b r021dbf 26 26 27 27 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 28 29 Components.utils.import("resource://v_identity/vI_log.js"); 30 let Log = setupLogging("virtualIdentity.rdfDatasource"); 31 28 32 function rdfDatasource(rdfFileName, dontRegisterObserver) { 29 33 this._rdfFileName = rdfFileName; … … 90 94 91 95 init: function() { 92 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource init.\n");96 // Log.debug("## rdfDatasource init.\n"); 93 97 94 98 this._openRdfDataSource(); … … 101 105 102 106 // this.refreshAccountInfo(); 103 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource init done.\n");107 // Log.debug("## rdfDatasource init done.\n"); 104 108 }, 105 109 … … 119 123 var fileURI = protoHandler.newFileURI(newFile); 120 124 121 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource init: read rdf from '" + fileURI.spec + "'\n");125 Log.debug("## rdfDatasource init: read rdf from '" + fileURI.spec + "'\n"); 122 126 123 127 this._rdfDataSource = 124 128 this._rdfService.GetDataSourceBlocking(fileURI.spec); 125 129 126 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");130 // Log.debug("## rdfDatasource read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n"); 127 131 }, 128 132 … … 168 172 rdfUpgrade : function() { 169 173 var currentVersion = this.getCurrentRDFFileVersion(); 170 if (vI.notificationBar) vI.notificationBar.dump("checking for previous version of rdf, found " +174 Log.debug("checking for previous version of rdf, found " + 171 175 currentVersion + "\nrdf-upgrade required.\n") 172 176 switch (currentVersion) { … … 182 186 } 183 187 this.storeRDFVersion(); 184 if (vI.notificationBar) vI.notificationBar.dump("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.\n\n");188 Log.debug("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.\n\n"); 185 189 }, 186 190 // ************** RDF UPGRADE CODE **************************************************** 187 191 // only used for upgrade to 0.0.3 - loop through all ressources. 188 192 _transferAllResources : function () { 189 if (vI.notificationBar) vI.notificationBar.dump("upgrade: transferAllResources ");193 Log.debug("upgrade: transferAllResources "); 190 194 var enumerator = this._rdfDataSource.GetAllResources(); 191 195 while (enumerator && enumerator.hasMoreElements()) { … … 207 211 if (container.IndexOf(resource) == -1) container.AppendElement(resource); 208 212 209 if (vI.notificationBar) vI.notificationBar.dump(".");210 } 211 if (vI.notificationBar) vI.notificationBar.dump("\n");213 Log.debug("."); 214 } 215 Log.debug("\n"); 212 216 }, 213 217 // ************** RDF UPGRADE CODE **************************************************** 214 218 _tagDefaultSMTP: function() { 215 if (vI.notificationBar) vI.notificationBar.dump("upgrade: tagDefaultSMTP ");219 Log.debug("upgrade: tagDefaultSMTP "); 216 220 for each (treeType in Array("email", "maillist", "newsgroup", "filter")) { 217 221 var enumerator = this.getContainer(treeType).GetElements(); … … 221 225 var smtp = this._getRDFValue(resource, "smtp") 222 226 if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", vI.DEFAULT_SMTP_TAG); 223 if (vI.notificationBar) vI.notificationBar.dump(".");227 Log.debug("."); 224 228 } 225 229 } 226 if (vI.notificationBar) vI.notificationBar.dump("\n");230 Log.debug("\n"); 227 231 }, 228 232 // ************** RDF UPGRADE CODE **************************************************** 229 233 _createAccountInfoContainers: function() { 230 if (vI.notificationBar) vI.notificationBar.dump("upgrade: createAccountInfoContainers \n");234 Log.debug("upgrade: createAccountInfoContainers \n"); 231 235 var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"]. 232 236 getService(Components.interfaces.nsIRDFContainerUtils); … … 260 264 // ************** RDF UPGRADE CODE **************************************************** 261 265 _createRDFContainers: function() { 262 if (vI.notificationBar) vI.notificationBar.dump("upgrade: createRDFContainers ");266 Log.debug("upgrade: createRDFContainers "); 263 267 var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"]. 264 268 getService(Components.interfaces.nsIRDFContainerUtils); … … 344 348 345 349 cleanAccountInfo : function() { 346 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: cleanAccountInfo\n");350 Log.debug("## rdfDatasource: cleanAccountInfo\n"); 347 351 348 352 var enumerator = this._identityContainer.GetElements(); … … 385 389 386 390 searchIdentityMismatch : function() { 387 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: searchIdentityMismatch");391 Log.debug("## rdfDatasource: searchIdentityMismatch"); 388 392 389 393 var relevantIDs = this.getRelevantIDs(); … … 412 416 } 413 417 if (mismatchIDs.length > 0) { 414 if (vI.notificationBar) vI.notificationBar.dump(" found mismatches on id(s).\n");418 Log.debug(" found mismatches on id(s).\n"); 415 419 416 420 window.openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0, … … 420 424 } 421 425 else { 422 if (vI.notificationBar) vI.notificationBar.dump(" found no mismatch\n");426 Log.debug(" found no mismatch\n"); 423 427 return false; 424 428 } … … 428 432 var keyField = (type == "identity")?"id":"smtp" // field to change is 'id' or 'smtp' dependent on type 429 433 for (var i = 0; i < mismatchItems.length; i++) { 430 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");434 Log.debug("## rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": "); 431 435 // search relevant Identities 432 436 for each (treeType in Array("email", "maillist", "newsgroup", "filter")) { … … 438 442 if (mismatchItems[i].key == "") this._unsetRDFValue(resource, keyField, mismatchItems[i].oldkey) 439 443 else this._setRDFValue(resource, keyField, mismatchItems[i].key) 440 if (vI.notificationBar) vI.notificationBar.dump(".");444 Log.debug("."); 441 445 } 442 446 } 443 447 } 444 if (vI.notificationBar) vI.notificationBar.dump("\n");448 Log.debug("\n"); 445 449 } 446 450 }, … … 464 468 465 469 searchSmtpMismatch : function() { 466 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: searchSmtpMismatch");470 Log.debug("## rdfDatasource: searchSmtpMismatch"); 467 471 468 472 var relevantSMTPs = this.getRelevantSMTPs(); … … 488 492 } 489 493 if (mismatchSMTPs.length > 0) { 490 if (vI.notificationBar) vI.notificationBar.dump(" found mismatches on smtp(s).\n");494 Log.debug(" found mismatches on smtp(s).\n"); 491 495 window.openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0, 492 496 "chrome, dialog, modal, alwaysRaised, resizable=yes", "smtp", mismatchSMTPs, … … 495 499 } 496 500 else { 497 if (vI.notificationBar) vI.notificationBar.dump(" found no mismatch\n");501 Log.debug(" found no mismatch\n"); 498 502 return false; 499 503 } … … 501 505 502 506 storeAccountInfo : function() { 503 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts\n");507 Log.debug("## rdfDatasource: storeAccounts\n"); 504 508 505 509 var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"] … … 509 513 for (let j = 0; j < account.identities.Count(); j++) { 510 514 var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity); 511 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts identity store id " + identity.key + "\n");515 // Log.debug("## rdfDatasource: storeAccounts identity store id " + identity.key + "\n"); 512 516 513 517 var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + identity.key); … … 523 527 524 528 function storeSmtp(server, parent) { 525 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts smtp store id " + server.key + "\n");529 // Log.debug("## rdfDatasource: storeAccounts smtp store id " + server.key + "\n"); 526 530 var resource = parent._rdfService.GetResource(parent._rdfNS + parent._rdfNSSMTPservers + "/" + server.key); 527 531 parent._setRDFValue(resource, "label", (server.description?server.description:server.hostname)); … … 540 544 } 541 545 542 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts done\n");546 // Log.debug("## rdfDatasource: storeAccounts done\n"); 543 547 }, 544 548 … … 565 569 if (!this._rdfDataSource) return null; 566 570 if (!recDescription) { 567 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: _getRDFResourceForVIdentity: no Recipient given.\n");571 Log.debug("## rdfDatasource: _getRDFResourceForVIdentity: no Recipient given.\n"); 568 572 return null; 569 573 } … … 581 585 582 586 removeVIdentityFromRDF : function (resource, recType) { 583 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");587 // Log.debug("## rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n"); 584 588 this._unsetRDFValue(resource, "email", this._getRDFValue(resource, "email")) 585 589 this._unsetRDFValue(resource, "fullName", this._getRDFValue(resource, "fullName")) … … 594 598 595 599 _unsetRDFValue : function (resource, field, value) { 596 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource _unsetRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");600 // Log.debug("## rdfDatasource _unsetRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n"); 597 601 var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field); 598 602 var name = this._rdfService.GetLiteral(value?value:""); … … 607 611 // this will be used from rdfDataTree to get all RDF values, callFunction is vI.rdfDataTreeCollection.__addNewDatum 608 612 readAllEntriesFromRDF : function (addNewDatum, treeType, idData) { 609 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: readAllEntriesFromRDF " + this._rdfService + " " + this._rdfDataSource + " " + this + "\n");613 // Log.debug("## rdfDatasource: readAllEntriesFromRDF " + this._rdfService + " " + this._rdfDataSource + " " + this + "\n"); 610 614 var enumerator = this.getContainer(treeType).GetElements(); 611 615 while (enumerator && enumerator.hasMoreElements()) { … … 628 632 if (recipientType == "addr_newsgroups") return { recDesc : recipient, recType : "newsgroup" } 629 633 else if (this.__isMailingList(recipient)) { 630 vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is MailList\n");634 Log.debug("## __getDescriptionAndType: '" + recipient + "' is MailList\n"); 631 635 return { recDesc : this.__getMailListName(recipient), recType : "maillist" } 632 636 } 633 637 else { 634 vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is no MailList\n");638 Log.debug("## __getDescriptionAndType: '" + recipient + "' is no MailList\n"); 635 639 var localIdentityData = new vI.identityData(recipient, null, null, null, null, null, null); 636 640 return { recDesc : localIdentityData.combinedName, recType : "email" } … … 674 678 findMatchingFilter : function (recipient, recipientType) { 675 679 var recDescription = this.__getDescriptionAndType(recipient, recipientType).recDesc; 676 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter for " + recDescription + ".\n");680 Log.debug("## rdfDatasource: findMatchingFilter for " + recDescription + ".\n"); 677 681 var enumerator = this._filterContainer.GetElements(); 678 682 while (enumerator && enumerator.hasMoreElements()) { … … 686 690 if (filter == "") continue; 687 691 if (/^\/(.*)\/$/.exec(filter)) 688 { if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter with RegExp '"692 { Log.debug("## rdfDatasource: findMatchingFilter with RegExp '" 689 693 + filter.replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; } 690 else { if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter, compare with '"694 else { Log.debug("## rdfDatasource: findMatchingFilter, compare with '" 691 695 + filter + "'\n"); recentfilterType = filterType.StrCmp; } 692 696 … … 695 699 try { /^\/(.*)\/$/.exec(filter); 696 700 if (recDescription.match(new RegExp(RegExp.$1,"i"))) { 697 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter found stored data.\n");701 Log.debug("## rdfDatasource: findMatchingFilter found stored data.\n"); 698 702 return this._readVIdentityFromRDF(resource); 699 703 } … … 702 706 case filterType.StrCmp: 703 707 if (recDescription.toLowerCase().indexOf(filter.toLowerCase()) != -1) { 704 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter found stored data.\n");708 Log.debug("## rdfDatasource: findMatchingFilter found stored data.\n"); 705 709 return this._readVIdentityFromRDF(resource); 706 710 } … … 708 712 } 709 713 } 710 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter no match found.\n");714 Log.debug("## rdfDatasource: findMatchingFilter no match found.\n"); 711 715 return null; 712 716 }, … … 719 723 if (!this._rdfDataSource.hasArcOut(resource, email)) { 720 724 // no data available --> give up. 721 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: readVIdentityFromRDF no data found.\n");725 Log.debug("## rdfDatasource: readVIdentityFromRDF no data found.\n"); 722 726 return null; 723 727 } 724 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: readVIdentityFromRDF found stored data.\n");728 Log.debug("## rdfDatasource: readVIdentityFromRDF found stored data.\n"); 725 729 726 730 return this._readVIdentityFromRDF(resource); … … 734 738 if (!smtp) smtp = vI.NO_SMTP_TAG; 735 739 736 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: email='" + email +740 Log.debug("## rdfDatasource: email='" + email + 737 741 "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n"); 738 742 739 743 var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null; 740 744 var extras_status = (typeof(vI.storageExtras)=='function')?extras.status():" not used"; 741 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: extras:" + extras_status + "\n");745 Log.debug("## rdfDatasource: extras:" + extras_status + "\n"); 742 746 743 747 var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras) … … 746 750 747 751 _getRDFValue : function (resource, field) { 748 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource _getRDFValue " + this._rdfService + " " + this._rdfDataSource + " " + this + "\n");752 // Log.debug("## rdfDatasource _getRDFValue " + this._rdfService + " " + this._rdfDataSource + " " + this + "\n"); 749 753 var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field); 750 754 var target = this._rdfDataSource.GetTarget(resource, predicate, true); … … 771 775 772 776 updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, storeSMTP, prevRecDescription, prevRecType) { 773 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource (" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n");777 // Log.debug("## rdfDatasource (" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n"); 774 778 775 779 // if (!localIdentityData.email) { 776 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");780 // Log.debug("## rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n"); 777 781 // return; 778 782 // } … … 784 788 var resource = this._getRDFResourceForVIdentity(prevRecDescription, prevRecType); 785 789 if (!resource) return; 786 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");790 // Log.debug("## rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n"); 787 791 788 792 var position = this.getContainer(recType).IndexOf(resource); // check for index in new recType … … 803 807 if (localIdentityData.extras) localIdentityData.extras.loopForRDF(this, resource, "set"); 804 808 805 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");809 Log.debug("## rdfDatasource: updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n"); 806 810 if (position != -1) this.getContainer(recType).InsertElementAt(resource, position, true); 807 811 else this.getContainer(recType).AppendElement(resource); … … 809 813 810 814 _setRDFValue : function (resource, field, value) { 811 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: _setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");815 // Log.debug("## rdfDatasource: _setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n"); 812 816 if (!value) return value; // return if some value was not set. 813 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource _setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");817 // Log.debug("## rdfDatasource _setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n"); 814 818 var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field); 815 819 var name = this._rdfService.GetLiteral(value); … … 827 831 observe : function(subject, topic, data) { 828 832 if (topic == "am-smtpChanges" || topic == "am-acceptChanges") { 829 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: account/smtp changes observed\n");833 Log.debug("## rdfDatasource: account/smtp changes observed\n"); 830 834 this.searchIdentityMismatch(); 831 835 this.searchSmtpMismatch(); … … 834 838 }, 835 839 register : function() { 836 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: register AccountManagerObserver\n");840 Log.debug("## rdfDatasource: register AccountManagerObserver\n"); 837 841 var obsService = Components.classes["@mozilla.org/observer-service;1"]. 838 842 getService(Components.interfaces.nsIObserverService) … … 872 876 var localIdentities = new vI.identityCollection(); 873 877 localIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipientName, recipientType)); 874 if (localIdentities.number == 1) vI.notificationBar.dump("## rdfDatasourceAccess: using data from direct match\n");878 if (localIdentities.number == 1) Log.debug("## rdfDatasourceAccess: using data from direct match\n"); 875 879 localIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipientName, recipientType)); 876 880 877 881 var returnValue = {}; returnValue.identityCollection = localIdentities; returnValue.result = "drop"; 878 882 if (localIdentities.number == 0) { 879 vI.notificationBar.dump("## rdfDatasourceAccess: updateVIdentityFromStorage no usable Storage-Data found.\n");883 Log.debug("## rdfDatasourceAccess: updateVIdentityFromStorage no usable Storage-Data found.\n"); 880 884 } 881 885 else { 882 vI.notificationBar.dump("## rdfDatasourceAccess: compare with current Identity\n");886 Log.debug("## rdfDatasourceAccess: compare with current Identity\n"); 883 887 if (this._pref.getBoolPref("storage_getOneOnly") && // if requested to retrieve only storageID for first recipient entered 884 888 isNotFirstInputElement && // and it is now not the first recipient entered 885 889 !localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, false).equal) { // and this id is different than the current used one 886 vI.notificationBar.setNote(890 setNote( 887 891 this.stringBundle.GetStringFromName("vident.smartIdentity.vIStorageCollidingIdentity"), // than drop the potential changes 888 892 "storage_notification"); … … 891 895 // only update fields if new Identity is different than old one. 892 896 else { 893 vI.notificationBar.dump("## rdfDatasourceAccess: updateVIdentityFromStorage check if storage-data matches current Identity.\n");897 Log.debug("## rdfDatasourceAccess: updateVIdentityFromStorage check if storage-data matches current Identity.\n"); 894 898 var compResult = localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, true); 895 899 if (!compResult.equal) { … … 912 916 var multipleRecipients = (recipients.length > 1); 913 917 var dontUpdateMultipleNoEqual = (this._pref.getBoolPref("storage_dont_update_multiple") && multipleRecipients) 914 vI.notificationBar.dump("## rdfDatasource: storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")918 Log.debug("## rdfDatasource: storeVIdentityToAllRecipients dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n") 915 919 916 920 for (var j = 0; j < recipients.length; j++) { … … 923 927 getVIdentityFromAllRecipients : function(allIdentities, recipients) { 924 928 if (!this._pref.getBoolPref("storage")) 925 { vI.notificationBar.dump("## storage: Storage deactivated\n"); return; }929 { Log.debug("## storage: Storage deactivated\n"); return; } 926 930 var initnumber = allIdentities.number; 927 931 for (var j = 0; j < recipients.length; j++) { … … 929 933 allIdentities.addWithoutDuplicates(this._rdfDataSource.findMatchingFilter(recipients[j].recipient, recipients[j].recipientType)); 930 934 } 931 vI.notificationBar.dump("## storage: found " + (allIdentities.number-initnumber) + " address(es)\n")935 Log.debug("## storage: found " + (allIdentities.number-initnumber) + " address(es)\n") 932 936 }, 933 937 934 938 __updateStorageFromVIdentity : function(identityData, recipient, recipientType, dontUpdateMultipleNoEqual) { 935 vI.notificationBar.dump("## rdfDatasource: __updateStorageFromVIdentity.\n")939 Log.debug("## rdfDatasource: __updateStorageFromVIdentity.\n") 936 940 var storageDataByType = this._rdfDataSource.readVIdentityFromRDF(recipient, recipientType); 937 941 var storageDataByFilter = this._rdfDataSource.findMatchingFilter(recipient, recipientType); … … 946 950 if ( (!storageDataByType && !storageDataByFilterEqual) || 947 951 (!storageDataByTypeEqual && !storageDataByFilterEqual && !dontUpdateMultipleNoEqual) ) { 948 vI.notificationBar.dump("## storage: __updateStorageFromVIdentity updating\n")952 Log.debug("## storage: __updateStorageFromVIdentity updating\n") 949 953 if (storageDataByType && !storageDataByTypeEqual && this._pref.getBoolPref("storage_warn_update")) { 950 vI.notificationBar.dump("## storage: __updateStorageFromVIdentity overwrite warning\n");954 Log.debug("## storage: __updateStorageFromVIdentity overwrite warning\n"); 951 955 doUpdate = this.__askWarning(this.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix)); 952 956 } … … 1034 1038 values.id = values.id?values.id:"import_" + id 1035 1039 relevantIDs[id] = values; 1036 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n");1040 Log.debug("## rdfDatasourceImporter import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n"); 1037 1041 } 1038 1042 return relevantIDs; … … 1066 1070 values.smtp = values.smtp?values.smtp:"import_" + smtp; 1067 1071 relevantSMTPs[smtp] = values; 1068 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n");1072 Log.debug("## rdfDatasourceImporter import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n"); 1069 1073 } 1070 1074 return relevantSMTPs; … … 1096 1100 1097 1101 if (filePicker.show() == Components.interfaces.nsIFilePicker.returnOK) { 1098 if (vI.notificationBar) vI.notificationBar.dump("\n## rdfDatasourceImporter IMPORT\n## rdfDatasourceImporter import: preparation:\n");1102 Log.debug("\n## rdfDatasourceImporter IMPORT\n## rdfDatasourceImporter import: preparation:\n"); 1099 1103 1100 1104 var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"] … … 1106 1110 filePicker.file.copyTo(importRdfDataFile.parent,importRdfDataFile.leafName); 1107 1111 1108 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n");1112 Log.debug("## rdfDatasourceImporter import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n"); 1109 1113 1110 1114 // init Datasources … … 1115 1119 var relevantSMTPs = this._translateRelevantSMTPs(); 1116 1120 1117 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: preparation done.\n");1118 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: starting import:\n");1121 Log.debug("## rdfDatasourceImporter import: preparation done.\n"); 1122 Log.debug("## rdfDatasourceImporter import: starting import:\n"); 1119 1123 1120 1124 for each (treeType in Array("email", "maillist", "newsgroup", "filter")) { … … 1123 1127 var container = this._rdfImportDataSource.getContainer(treeType) 1124 1128 if (container.GetCount() == 0) continue; 1125 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n");1129 Log.debug("## rdfDatasourceImporter importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n"); 1126 1130 var enumerator = container.GetElements(); 1127 1131 // re-initialize dataSource to point rdfService to the right Resources … … 1131 1135 var resource = enumerator.getNext(); count += 1; 1132 1136 resource.QueryInterface(Components.interfaces.nsIRDFResource); 1133 if (vI.notificationBar) vI.notificationBar.dump("## " + count + " ");1137 Log.debug("## " + count + " "); 1134 1138 var name = this._rdfImportDataSource._getRDFValue(resource, "name") 1135 1139 var email = this._rdfImportDataSource._getRDFValue(resource, "email") … … 1149 1153 } 1150 1154 1151 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: removing temporary file " + importRdfDataFile.path + ".\n");1155 Log.debug("## rdfDatasourceImporter import: removing temporary file " + importRdfDataFile.path + ".\n"); 1152 1156 this._rdfImportDataSource = null; importRdfDataFile.remove(false); 1153 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: import done.\n");1154 1155 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: cleaning ID/SMTP storages:\n");1157 Log.debug("## rdfDatasourceImporter import: import done.\n"); 1158 1159 Log.debug("## rdfDatasourceImporter import: cleaning ID/SMTP storages:\n"); 1156 1160 this._rdfDataSource = new rdfDatasource(this._rdfFileName, true); 1157 1161 … … 1164 1168 this._rdfDataSource.clean(); 1165 1169 this._rdfDataSource = null; 1166 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: cleaning ID/SMTP storages done.\n");1167 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter IMPORT DONE.\n");1170 Log.debug("## rdfDatasourceImporter import: cleaning ID/SMTP storages done.\n"); 1171 Log.debug("## rdfDatasourceImporter IMPORT DONE.\n"); 1168 1172 } 1169 1173 } -
content/modules/vI_smartIdentityCollection.js
r67fe6b r021dbf 26 26 27 27 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 28 28 29 Components.utils.import("resource://v_identity/vI_log.js"); 30 29 31 function smartIdentityCollection(msgHdr, preseletedID, currentIDisVID, newsgroup, recipients) { 30 32 dump("## smartIdentityCollection: constructor\n"); … … 62 64 // this function adds a timestamp to the current sender 63 65 __autoTimestamp : function() { 64 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __autoTimestamp()\n");66 MyLog.debug("## smartIdentity: __autoTimestamp()\n"); 65 67 if (this._IDisVID) { 66 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Virtual Identity in use, aborting\n");68 MyLog.debug("## smartIdentity: Virtual Identity in use, aborting\n"); 67 69 return; 68 70 } … … 72 74 var domain = current_email[1]; 73 75 74 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n");76 MyLog.debug("## smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n"); 75 77 76 78 var autoString = this._pref.getCharPref("autoString"); … … 84 86 85 87 var new_email = autoString.replace(/%l/g, localpart).replace(/%d/g, domain).replace(/%t/g,dateString); 86 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: new email: " + new_email + "\n");88 MyLog.debug("## smartIdentity: new email: " + new_email + "\n"); 87 89 88 90 var newIdentity = new vI.identityData(new_email, … … 94 96 95 97 __ignoreID : function() { 96 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: checking " + this._pref.getCharPref("idSelection_ignoreIDs") + " against " + this._preselectedID.key + "\n")98 MyLog.debug("## smartIdentity: checking " + this._pref.getCharPref("idSelection_ignoreIDs") + " against " + this._preselectedID.key + "\n") 97 99 // check if usage if virtual Identities should be used at all for the currently selected ID 98 100 if (this._pref.getCharPref("idSelection_ignoreIDs").indexOf(":" + this._preselectedID.key + ":") != -1) { 99 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: not using virtual Identites for ID " + this._preselectedID.key + "\n");101 MyLog.debug("## smartIdentity: not using virtual Identites for ID " + this._preselectedID.key + "\n"); 100 102 return true; 101 103 } … … 104 106 105 107 NewMail : function() { 106 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: NewMail()\n");108 MyLog.debug("## smartIdentity: NewMail()\n"); 107 109 if (this.__ignoreID()) return; 108 110 this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients); … … 118 120 // reorder list of Identities to prefer it on autoselect 119 121 // has to be done before Identities are added to the Menu 120 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found existing Identity, reorder to prefer this one.\n");122 MyLog.debug("## smartIdentity: found existing Identity, reorder to prefer this one.\n"); 121 123 var firstIdentity = this._allIdentities.identityDataCollection[index]; 122 124 for (var i = index; index > 0; index--) { … … 131 133 132 134 ReplyOnSent : function() { 133 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");135 MyLog.debug("## smartIdentity: ReplyOnSent() (rules like SmartDraft)\n"); 134 136 this.__SmartDraftOrReplyOnSent(); 135 137 this._rdfDatasourceAccess.getVIdentityFromAllRecipients(this._allIdentities, this._recipients); … … 137 139 138 140 Draft : function() { 139 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Draft()\n");141 MyLog.debug("## smartIdentity: Draft()\n"); 140 142 141 143 this.__SmartDraftOrReplyOnSent(); … … 156 158 __SmartDraftOrReplyOnSent : function() { 157 159 if (!this._pref.getBoolPref("smart_draft")) 158 { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartDraft deactivated\n"); return; }159 160 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent()\n");160 { MyLog.debug("## smartIdentity: SmartDraft deactivated\n"); return; } 161 162 MyLog.debug("## smartIdentity: __SmartDraftOrReplyOnSent()\n"); 161 163 162 164 if (this._msgHdr) { 163 165 this.__parseHeadersWithArray(this._msgHdr.author, this._allIdentities) 164 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'\n");165 } 166 else if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");166 MyLog.debug("## smartIdentity: sender '" + this._allIdentities.identityDataCollection[0].combinedName + "'\n"); 167 } 168 else MyLog.debug("## smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n"); 167 169 }, 168 170 … … 178 180 var recentfilterType; var skipRegExp = false; 179 181 if (filterList.length <= 1 && filterList[0] == "") 180 { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: no filters configured\n"); recentfilterType = filterType.None; }182 { MyLog.debug("## smartIdentity: no filters configured\n"); recentfilterType = filterType.None; } 181 183 else if (/^[+-]?\/(.*)\/$/.exec(filterList[i])) 182 { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: filter emails with RegExp '"184 { MyLog.debug("## smartIdentity: filter emails with RegExp '" 183 185 + filterList[i].replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; } 184 else { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: filter emails, compare with '"186 else { MyLog.debug("## smartIdentity: filter emails, compare with '" 185 187 + filterList[i] + "'\n"); recentfilterType = filterType.StrCmp; } 186 188 for (var j = 0; j < this._allIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in … … 200 202 } 201 203 catch(vErr) { 202 if (vI.notificationBar) vI.notificationBar.addNote(204 addNote( 203 205 vI.main.elements.strings.getString("vident.smartIdentity.ignoreRegExp") + 204 206 +filterList[i].replace(/\\/g,"\\\\") + " .", … … 238 240 // if mailing-list ignore to-header (usually the mailing list address) 239 241 if (replyHeaderNameToRead == "to" && this._msgHdr.getStringProperty("vI_list-id")) { 240 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n");242 MyLog.debug("## smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n"); 241 243 continue; 242 244 } … … 248 250 .getMostRecentWindow("mail:3pane"); 249 251 250 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found stored header '" +252 MyLog.debug("## smartIdentity: found stored header '" + 251 253 replyHeaderNameToRead + "': '" + window3pane.virtualIdentityExtension.storedHeaders["vI_" + replyHeaderNameToRead] + "'\n");*/ 252 254 253 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: reading header '" +255 MyLog.debug("## smartIdentity: reading header '" + 254 256 replyHeaderNameToRead + "': '" + value + "'\n"); 255 257 … … 262 264 // if there is no email than it makes no sense to use it as a sender 263 265 if (!splitted.identityDataCollection[i].email.match(/^.*@.*$/)) { 264 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: skipping '" +266 MyLog.debug("## smartIdentity: skipping '" + 265 267 splitted.identityDataCollection[i].email + "', no email\n") 266 268 continue; … … 271 273 this._allIdentities.addWithoutDuplicates(splitted.identityDataCollection[i]); 272 274 273 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found '" +275 MyLog.debug("## smartIdentity: found '" + 274 276 splitted.identityDataCollection[i].combinedName + "'\n") 275 277 } … … 278 280 279 281 Reply : function() { 280 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Reply()\n");282 MyLog.debug("## smartIdentity: Reply()\n"); 281 283 282 284 if (this._msgHdr && this._newsgroup && !this._msgHdr.getStringProperty("vI_content_base")) { … … 292 294 if (this._pref.getBoolPref("smart_detectByReceivedHeader")) { 293 295 if (!this._msgHdr.getStringProperty("vI_received")) { // mail was not received 294 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n");296 MyLog.debug("## smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n"); 295 297 this.ReplyOnSent(); 296 298 return; … … 303 305 304 306 if (this._msgHdr && (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_SENTMAIL)) { 305 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: reply from Sent folder.");307 MyLog.debug("## smartIdentity: reply from Sent folder."); 306 308 if (this._msgHdr.folder.flags & MSG_FOLDER_FLAG_INBOX) 307 if (vI.notificationBar) vI.notificationBar.dump(" Folder is INBOX, assuming Reply-Case. \n");309 MyLog.debug(" Folder is INBOX, assuming Reply-Case. \n"); 308 310 else { 309 if (vI.notificationBar) vI.notificationBar.dump(" Using SmartDraft. \n");311 MyLog.debug(" Using SmartDraft. \n"); 310 312 this.ReplyOnSent(); 311 313 return; … … 322 324 if (storageIdentities.number == 0 || !this._pref.getBoolPref("idSelection_storage_ignore_smart_reply")) 323 325 this.__SmartReply(); 324 else if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply skipped, Identities in Storage found.\n");326 else MyLog.debug("## smartIdentity: SmartReply skipped, Identities in Storage found.\n"); 325 327 326 328 // merge SmartReply-Identities and Storage-Identites … … 333 335 } 334 336 335 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left\n")337 MyLog.debug("## smartIdentity: merged SmartReply & Storage, " + this._allIdentities.number + " address(es) left\n") 336 338 }, 337 339 … … 339 341 __SmartReply : function() { 340 342 if (!this._pref.getBoolPref("smart_reply")) 341 { if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply deactivated\n"); return; }343 { MyLog.debug("## smartIdentity: SmartReply deactivated\n"); return; } 342 344 if (this._newsgroup && !this._pref.getBoolPref("smart_reply_for_newsgroups")) { 343 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply, answering to a newsgroup, aborting\n");345 MyLog.debug("## smartIdentity: SmartReply, answering to a newsgroup, aborting\n"); 344 346 return; 345 347 } 346 348 347 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: __SmartReply()\n");348 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")349 MyLog.debug("## smartIdentity: __SmartReply()\n"); 350 MyLog.debug("## smartIdentity: ----------------------------------------------------------\n") 349 351 if (this._msgHdr) { 350 352 /* first step: collect addresses */ 351 353 this.__smartReplyCollectAddresses(); 352 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: " + this._allIdentities.number + " address(es) after parsing, before filtering\n")354 MyLog.debug("## smartIdentity: " + this._allIdentities.number + " address(es) after parsing, before filtering\n") 353 355 354 356 /* second step: filter (and sort) addresses */ 355 357 this.__filterAddresses(); 356 358 357 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: filtering done, " + this._allIdentities.number + " address(es) left\n")359 MyLog.debug("## smartIdentity: filtering done, " + this._allIdentities.number + " address(es) left\n") 358 360 359 361 /* set default FullName */ … … 363 365 if (this._allIdentities.identityDataCollection[index].fullName == "") { 364 366 this._allIdentities.identityDataCollection[index].fullName = smart_reply_defaultFullName 365 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: added default FullName '" +367 MyLog.debug("## smartIdentity: added default FullName '" + 366 368 smart_reply_defaultFullName + "' to '" + this._allIdentities.identityDataCollection[index].email + "'\n") 367 369 } … … 373 375 /* will not be added to the menu but probably choosen with __smartIdentitySelection */ 374 376 if (this._pref.getBoolPref("smart_reply_ignoreFullName")) { 375 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: compare with existing Identities (ignoring FullNames).\n")377 MyLog.debug("## smartIdentity: compare with existing Identities (ignoring FullNames).\n") 376 378 377 379 for (var index = 0; index < this._allIdentities.number; index++) { … … 380 382 var newFullName = gAccountManager.getIdentity(idKey).fullName; 381 383 this._allIdentities.identityDataCollection[index].fullName = newFullName; 382 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");384 MyLog.debug("## smartIdentity: replaced Fullname of '" + this._allIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n"); 383 385 } 384 386 } 385 387 } 386 388 } 387 else if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: SmartReply skipped. No Header-information found.\n");388 389 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")389 else MyLog.debug("## smartIdentity: SmartReply skipped. No Header-information found.\n"); 390 391 MyLog.debug("## smartIdentity: ----------------------------------------------------------\n") 390 392 }, 391 393 -
content/prefDialog/vI_prefDialog.xml
r67fe6b r021dbf 34 34 <![CDATA[ 35 35 with (virtualIdentityExtension.LIB) { 36 if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: constructor\n");36 MyLog.debug("## identitySelector: constructor\n"); 37 37 var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"] 38 38 .getService(Components.interfaces.nsIMsgAccountManager); … … 62 62 <setter><![CDATA[ 63 63 with (virtualIdentityExtension.LIB) { 64 if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: setting value to '" + val + "'\n");64 MyLog.debug("## identitySelector: setting value to '" + val + "'\n"); 65 65 var listItems = this.childNodes; 66 66 for (var index = 0; index < listItems.length; index++) { 67 67 var key = listItems[index].getAttribute("value"); 68 68 listItems[index].checked = (val.indexOf(":" + key + ":") == -1); 69 if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: setting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n")69 MyLog.debug("## identitySelector: setting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n") 70 70 } 71 71 this._value = val; … … 74 74 <getter><![CDATA[ 75 75 with (virtualIdentityExtension.LIB) { 76 if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: getting value\n");76 MyLog.debug("## identitySelector: getting value\n"); 77 77 var returnVal = ""; 78 78 var listItems = this.childNodes; 79 79 for (var index = 0; index < listItems.length; index++) { 80 if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: getting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n");80 MyLog.debug("## identitySelector: getting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n"); 81 81 if (!listItems[index].checked) returnVal += " :" + listItems[index].getAttribute("value") + ": " 82 82 } 83 if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: getting value, result '" + returnVal + "'\n");83 MyLog.debug("## identitySelector: getting value, result '" + returnVal + "'\n"); 84 84 return returnVal; 85 85 } -
content/prefDialog/vI_prefDialog.xul
r67fe6b r021dbf 54 54 <script type="application/x-javascript" 55 55 src="chrome://v_identity/content/modules/vI_rdfDatasource.js" /> 56 <script type="application/x-javascript"57 src="chrome://v_identity/content/notificationbar/vI_notificationBar.js" />58 56 59 57 <stringbundleset id="stringbundleset"> … … 741 739 <label id="virtualIdentityExtension_extVersion" value="&vident.version;" hidden="true" /> 742 740 </hbox> 743 <!-- 744 <splitter id="vIDebugBoxSplitter" hidden="true"/> 745 <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true" 746 DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/> 747 --> 741 <textbox id="vIDebugBox" /> 748 742 </dialog> 749 743 </overlay> -
content/vI_getHeader.js
r67fe6b r021dbf 30 30 // XXX still missing implementation to select specific header by number and to display notification. 31 31 Components.utils.import("resource://v_identity/stdlib/msgHdrUtils.js"); 32 let Log = setupLogging("virtualIdentity.getHeader"); 32 33 33 34 // var storedHeaders = { }; … … 69 70 70 71 getHeader: function() { 71 vI.notificationBar.clear_dump();72 vI.notificationBar.dump("\n");72 clearDebugOutput(); 73 Log.debug("\n"); 73 74 74 75 if (!getHeader.headerToSearch) getHeader.prefObserverToSearchArray() … … 77 78 if (aHeaders.has("list-id")) { 78 79 getHeader.hdr.setStringProperty("vI_list-id","found"); 79 vI.notificationBar.dump("## getHeader: found header: list-id ...stored to recognize mailing-list\n");80 Log.debug("## getHeader: found header: list-id ...stored to recognize mailing-list\n"); 80 81 } 81 82 if (aHeaders.has("received")) { 82 83 getHeader.hdr.setStringProperty("vI_received","found"); 83 vI.notificationBar.dump("## getHeader: found header: received ...stored to recognize received mail\n");84 Log.debug("## getHeader: found header: received ...stored to recognize received mail\n"); 84 85 } 85 86 if (aHeaders.has("content-base")) { 86 87 getHeader.hdr.setStringProperty("vI_content_base","found"); 87 vI.notificationBar.dump("## getHeader: found header: content-base ...stored to recognize blog/news-feed\n");88 Log.debug("## getHeader: found header: content-base ...stored to recognize blog/news-feed\n"); 88 89 } 89 90 for (let index = 0; index < getHeader.headerToSearch.length; index++) { … … 95 96 let storedValue = getHeader.hdr.getProperty("vI_" + headerNameToSearch); 96 97 let storedConvValue = getHeader.unicodeConverter.ConvertToUnicode(storedValue); 97 vI.notificationBar.dump("## getHeader: found header: " + headerNameToSearch +98 Log.debug("## getHeader: found header: " + headerNameToSearch + 98 99 " - stored as '" + storedConvValue + "'\n"); 99 100 } … … 152 153 getHeader.headerToSearch = null; 153 154 154 vI.notificationBar.dump("## prefObserver: reload Message\n");155 Log.debug("## prefObserver: reload Message\n"); 155 156 MsgReload(); 156 157 } -
content/vI_getHeader.xul
r67fe6b r021dbf 37 37 <script type="application/x-javascript" src="chrome://v_identity/content/_overlayNameSpaceWrapper.js" /> 38 38 <script type="application/x-javascript" src="chrome://v_identity/content/vI_getHeader.js"/> 39 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>40 39 41 40 … … 45 44 46 45 <vbox id="messagepanebox" > 47 <splitter id="vIDebugBoxSplitter" hidden="true"/> 48 <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true" 49 DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/> 46 <textbox id="vIDebugBox" /> 50 47 </vbox> 51 48 -
content/vI_msgIdentityCloneTools.js
r67fe6b r021dbf 29 29 30 30 copySelectedIdentity : function(id_key) { 31 vI.notificationBar.dump("## msgIdentityCloneTools: copySelectedIdentity\n");31 MyLog.debug("## msgIdentityCloneTools: copySelectedIdentity\n"); 32 32 var msgIdentityElem = document.getElementById("msgIdentity"); 33 33 var msgIdentityPopupElem = document.getElementById("msgIdentityPopup"); … … 48 48 try { setSecuritySettings(1); enigSetMenuSettings(''); } catch(vErr) { }; 49 49 if (!existingIdentity) { 50 vI.notificationBar.dump("## msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");50 MyLog.debug("## msgIdentityCloneTools: signatureSwitch hide/remove signatures\n"); 51 51 // code to hide the text signature 52 52 try { if (msgIdentityCloneTools._pref.getBoolPref("hide_signature") && ss_signature.length == 0) { 53 vI.notificationBar.dump("## msgIdentityCloneTools: hide text/html signature");53 MyLog.debug("## msgIdentityCloneTools: hide text/html signature"); 54 54 ss_main.signatureSwitch() 55 vI.notificationBar.dump("\n");56 } } catch(vErr) { vI.notificationBar.dump(" -- missing signatureSwitch extension?\n"); };55 MyLog.debug("\n"); 56 } } catch(vErr) { MyLog.debug(" -- missing signatureSwitch extension?\n"); }; 57 57 // code to hide the sMime signature 58 58 try { if (msgIdentityCloneTools._pref.getBoolPref("hide_sMime_messageSignature")) { 59 59 var element = document.getElementById("menu_securitySign1"); 60 60 if (element.getAttribute("checked") == "true") { 61 vI.notificationBar.dump("## signatureSwitch hide_sMime_messageSignature with doCommand\n");61 MyLog.debug("## signatureSwitch hide_sMime_messageSignature with doCommand\n"); 62 62 element.doCommand(); 63 63 } … … 78 78 } 79 79 if (skipChangeGPGsign) 80 vI.notificationBar.dump("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");80 MyLog.debug("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n"); 81 81 else { 82 vI.notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");82 MyLog.debug("## signatureSwitch hide_openPGP_messageSignature with doCommand\n"); 83 83 element.doCommand(); 84 84 } … … 89 89 } 90 90 else { 91 vI.notificationBar.dump("## msgIdentityCloneTools: signatureSwitch restore signature\n");91 MyLog.debug("## msgIdentityCloneTools: signatureSwitch restore signature\n"); 92 92 // code to show the text signature 93 93 try { if (ss_signature.length > 0) { 94 vI.notificationBar.dump("## msgIdentityCloneTools: show text/html signature");94 MyLog.debug("## msgIdentityCloneTools: show text/html signature"); 95 95 ss_main.signatureSwitch() 96 vI.notificationBar.dump("\n");97 } } catch(vErr) { vI.notificationBar.dump(" -- missing signatureSwitch extension?\n"); };96 MyLog.debug("\n"); 97 } } catch(vErr) { MyLog.debug(" -- missing signatureSwitch extension?\n"); }; 98 98 // sMime and openGPG signature will not be re-added automatically 99 99 } … … 113 113 var awType = awGetPopupElement(row).selectedItem.getAttribute("value"); 114 114 if (awType == "addr_reply") { 115 vI.notificationBar.dump("## msgIdentityCloneTools: removed ReplyTo found in row " + row + "\n");115 MyLog.debug("## msgIdentityCloneTools: removed ReplyTo found in row " + row + "\n"); 116 116 awDeleteRow(row--); // removed one line therefore decrease row-value 117 117 } … … 123 123 if (!document.getElementById("autoReplyToSelfLabel").hasAttribute("hidden")) { 124 124 awAddRecipient("addr_reply",document.getElementById("msgIdentity_clone").label); 125 vI.notificationBar.dump("## msgIdentityCloneTools: added ReplyToSelf");125 MyLog.debug("## msgIdentityCloneTools: added ReplyToSelf"); 126 126 document.getElementById("autoReplyToSelfLabel").setAttribute("hidden","true"); 127 127 } -
content/vI_rdfAccountMismatchDialog.xul
r67fe6b r021dbf 36 36 zlevel="6"> 37 37 <script type="application/x-javascript" src="chrome://v_identity/content/_overlayNameSpaceWrapper.js" /> 38 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>39 38 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfAccountMismatchDialog.js" /> 40 39 -
content/vI_rdfDataEditor.xul
r67fe6b r021dbf 42 42 <script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" /> 43 43 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_helper.js" /> 44 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>45 44 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/> 46 45 … … 87 86 </groupbox> 88 87 </vbox> 89 <splitter id="vIDebugBoxSplitter" hidden="true"/> 90 <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true" 91 DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/> 92 88 <textbox id="vIDebugBox" /> 93 89 </dialog> -
content/vI_rdfDataTree.js
r67fe6b r021dbf 57 57 //this function is called every time the tree is sorted, filtered, or reloaded 58 58 loadTable : function() { 59 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDataTree: loadTable.\n");59 // MyLog.debug("## rdfDataTree: loadTable.\n"); 60 60 //remember scroll position. this is useful if this is an editable table 61 61 //to prevent the user from losing the row they edited … … 93 93 // set Tab label 94 94 this.tabElem.setAttribute("label", this.treeType + " (" + this.idTable.length + ")"); 95 // if (vI.notificationBar) vI.notificationBar.dump("## rdfDataTree: loadTable done.\n");95 // MyLog.debug("## rdfDataTree: loadTable done.\n"); 96 96 }, 97 97 … … 106 106 resource : resource, 107 107 identityData : localIdentityData} 108 // vI.notificationBar.dump("## addNewDatum.\n");108 // MyLog.debug("## addNewDatum.\n"); 109 109 localIdentityData.extras.addPrefs(pref); 110 110 idData.push(pref); 111 111 }, 112 112 sort : function(columnName) { 113 // vI.notificationBar.dump("## sort: " + columnName + ".\n");113 // MyLog.debug("## sort: " + columnName + ".\n"); 114 114 var order = this.treeElem.getAttribute("sortDirection") == "ascending" ? 1 : -1; 115 115 //if the column is passed and it's already sorted by that column, reverse sort -
content/vI_rdfDataTree.xul
r67fe6b r021dbf 63 63 <script type="application/x-javascript" src="chrome://v_identity/content/_overlayNameSpaceWrapper.js" /> 64 64 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_helper.js" /> 65 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>66 65 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_identityData.js" /> 67 66 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_rdfDatasource.js" /> … … 308 307 <!-- <splitter /> --> 309 308 <browser id="rdfDataTreeCollectionInfoBox" class="vI_htmlTextBox" type="chrome" cssSource="vI_rdfTreeInfo.css" disablehistory="true" onoverflow="virtualIdentityExtension.rdfDataTreeCollection.overflow();"/> 310 <splitter id="vIDebugBoxSplitter" hidden="true"/> 311 <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true" 312 DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/> 313 <script type="application/x-javascript">dump('window rdfDataTreeCollection done ' + parseInt((new Date()).getTime()) + ' ' + virtualIdentityExtension.initTime + ' ' + virtualIdentityExtension.rdfDataTreeCollection + '\n');</script> 309 <textbox id="vIDebugBox" /> 314 310 </window> -
content/vI_smartIdentity.js
r67fe6b r021dbf 24 24 25 25 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 26 26 27 Components.utils.import("resource://v_identity/vI_log.js"); 28 27 29 var smartIdentity = { 28 30 _pref : Components.classes["@mozilla.org/preferences-service;1"] … … 41 43 var newsgroup = gMsgCompose.compFields.newsgroups; 42 44 var autocreate = false; 43 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: msgComposeTypeReference = " + gMsgCompose.type + "\n");45 MyLog.debug("## smartIdentity: msgComposeTypeReference = " + gMsgCompose.type + "\n"); 44 46 switch (gMsgCompose.type) { 45 47 case msgComposeTypeReference.Reply: … … 50 52 case msgComposeTypeReference.ReplyWithTemplate: 51 53 case msgComposeTypeReference.ReplyToList: 52 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Reply\n");54 MyLog.debug("## smartIdentity: Reply\n"); 53 55 msgHdr = smartIdentity.messenger. 54 56 messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI); … … 58 60 case msgComposeTypeReference.Draft: 59 61 case msgComposeTypeReference.Template: 60 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: Draft\n");62 MyLog.debug("## smartIdentity: Draft\n"); 61 63 msgHdr = smartIdentity.messenger. 62 64 messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId); … … 69 71 case msgComposeTypeReference.NewsPost: 70 72 case msgComposeTypeReference.MailToUrl: 71 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: New Mail\n");73 MyLog.debug("## smartIdentity: New Mail\n"); 72 74 smartIdentity._smartIdentityCollection = new vI.smartIdentityCollection(null, getCurrentIdentity(), document.getElementById("msgIdentity_clone").vid, newsgroup, this._getRecipients()); 73 75 // to enable composing new email with new identity: identity is hidden in subject line … … 75 77 var subject = gMsgCompose.compFields.subject.split(/\n/); 76 78 if (subject.length > 1 && subject[1] == "virtualIdentityExtension") { 77 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: NewMail() found stored identity preset: " + subject[2] + "\n");79 MyLog.debug("## smartIdentity: NewMail() found stored identity preset: " + subject[2] + "\n"); 78 80 smartIdentity._smartIdentityCollection.__parseHeadersWithArray(subject[2], smartIdentity._smartIdentityCollection._allIdentities); 79 81 gMsgCompose.compFields.subject = subject[0]; … … 98 100 99 101 __smartIdentitySelection : function(autocreate) { 100 if (vI.notificationBar) vI.notificationBar.dump("## __smartIdentitySelection autocreate=" + autocreate + "\n");102 MyLog.debug("## __smartIdentitySelection autocreate=" + autocreate + "\n"); 101 103 102 104 if (smartIdentity._pref.getBoolPref("idSelection_preferExisting")) { 103 105 var existingIDIndex = smartIdentity._smartIdentityCollection._foundExistingIdentity(); 104 106 if (existingIDIndex) { 105 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentity: found existing Identity, use without interaction.\n");107 MyLog.debug("## smartIdentity: found existing Identity, use without interaction.\n"); 106 108 // add all Indentities to Clone Menu before selecting and leaving the function 107 109 document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities); … … 112 114 113 115 document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(smartIdentity._smartIdentityCollection._allIdentities); 114 if (vI.notificationBar) vI.notificationBar.dump("## __smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" +116 MyLog.debug("## __smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" + 115 117 smartIdentity._smartIdentityCollection._allIdentities.number + 116 118 " smartIdentity._pref.getBoolPref('idSelection_ask_always')=" + … … 122 124 || smartIdentity._smartIdentityCollection._allIdentities.number > 1)) { 123 125 for (var index = 0; index < smartIdentity._smartIdentityCollection._allIdentities.number; index++) { 124 if (vI.notificationBar) vI.notificationBar.dump("## smartIdentityReplyDialog index=" + index + ": '" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].combinedName + "' "126 MyLog.debug("## smartIdentityReplyDialog index=" + index + ": '" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].combinedName + "' " 125 127 + "(" + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].id.value + "," + smartIdentity._smartIdentityCollection._allIdentities.identityDataCollection[index].smtp.value + ")\n"); 126 128 } … … 136 138 137 139 changeIdentityToSmartIdentity : function(allIdentities, selectedValue) { 138 if (vI.notificationBar) vI.notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number + "\n");139 if (vI.notificationBar) vI.notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "140 MyLog.debug("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number + "\n"); 141 MyLog.debug("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' " 140 142 + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")\n"); 141 143 document.getElementById("msgIdentity_clone").selectedMenuItem = allIdentities.menuItems[selectedValue]; … … 144 146 if (allIdentities.number > 1) label += " " 145 147 + vI.main.elements.strings.getString("vident.smartIdentity.moreThanOne"); 146 if (vI.notificationBar) vI.notificationBar.addNote(label + ".", "smart_reply_notification");148 addNote(label + ".", "smart_reply_notification"); 147 149 } 148 150 smartIdentity.__removeSmartIdentityFromRecipients(allIdentities, selectedValue); … … 187 189 awSetInputAndPopupValue(input, "", popup, "addr_to", -1); 188 190 awCleanupRows() 189 if (vI.notificationBar) vI.notificationBar.addNote(" " +191 addNote(" " + 190 192 vI.main.elements.strings.getString("vident.smartIdentity.remRecipient"), 191 193 "smart_reply_notification"); -
content/vI_storage.js
r67fe6b r021dbf 31 31 32 32 Components.utils.import("resource://gre/modules/AddonManager.jsm"); 33 Components.utils.import("resource://v_identity/vI_log.js"); 34 33 35 34 36 var storage = { … … 44 46 45 47 clean: function() { 46 vI.notificationBar.dump("## storage: clean.\n");48 MyLog.debug("## storage: clean.\n"); 47 49 storage.multipleRecipients = null; 48 50 storage.lastCheckedEmail = {}; … … 58 60 replacement_functions : { 59 61 awSetInputAndPopupValue : function (inputElem, inputValue, popupElem, popupValue, rowNumber) { 60 vI.notificationBar.dump("## storage: awSetInputAndPopupValue '" + inputElem.id +"'\n");62 MyLog.debug("## storage: awSetInputAndPopupValue '" + inputElem.id +"'\n"); 61 63 storage.original_functions.awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber); 62 64 storage.updateVIdentityFromStorage(inputElem); … … 67 69 // only react on events triggered by addressCol2 - textinput Elements 68 70 if (!element || ! element.id.match(/^addressCol2*/)) return; 69 vI.notificationBar.dump("\n## storage: awOnBlur '" + element.id +"'\n");71 MyLog.debug("\n## storage: awOnBlur '" + element.id +"'\n"); 70 72 storage.updateVIdentityFromStorage(element); 71 73 storage.focusedElement = null; … … 78 80 79 81 awPopupOnCommand : function (element) { 80 vI.notificationBar.dump("\n## storage: awPopupOnCommand'" + element.id +"'\n");82 MyLog.debug("\n## storage: awPopupOnCommand'" + element.id +"'\n"); 81 83 storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2"))); 82 84 if (element.selectedItem.getAttribute("value") == "addr_reply") // if reply-to is manually entered disable AutoReplyToSelf … … 130 132 updateVIdentityFromStorage: function(inputElement) { 131 133 if (!storage._pref.getBoolPref("storage")) 132 { vI.notificationBar.dump("## storage: Storage deactivated\n"); return; }133 vI.notificationBar.dump("## storage: updateVIdentityFromStorage()\n");134 { MyLog.debug("## storage: Storage deactivated\n"); return; } 135 MyLog.debug("## storage: updateVIdentityFromStorage()\n"); 134 136 135 137 var recipientType = document.getElementById(inputElement.id.replace(/^addressCol2/,"addressCol1")) … … 140 142 if (storage.firstUsedInputElement == inputElement) 141 143 storage.firstUsedInputElement = null; 142 vI.notificationBar.dump("## storage: field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n")144 MyLog.debug("## storage: field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n") 143 145 return; 144 146 } 145 147 146 148 if (inputElement.value == "") { 147 vI.notificationBar.dump("## storage: no recipient found, not checked.\n"); return;149 MyLog.debug("## storage: no recipient found, not checked.\n"); return; 148 150 } 149 151 150 152 var row = inputElement.id.replace(/^addressCol2#/,"") 151 153 if (storage.lastCheckedEmail[row] && storage.lastCheckedEmail[row] == inputElement.value) { 152 vI.notificationBar.dump("## storage: same email than before, not checked again.\n"); return;154 MyLog.debug("## storage: same email than before, not checked again.\n"); return; 153 155 } 154 156 storage.lastCheckedEmail[row] = inputElement.value; … … 161 163 162 164 if (storageResult.identityCollection.number == 0) return; // return if there was no match 163 vI.notificationBar.dump("## storage: updateVIdentityFromStorage result: " + storageResult.result + "\n");165 MyLog.debug("## storage: updateVIdentityFromStorage result: " + storageResult.result + "\n"); 164 166 // found storageData, so store InputElement 165 167 if (!storage.firstUsedInputElement) storage.firstUsedInputElement = inputElement; … … 168 170 if (storageResult.result != "equal") { 169 171 for (var j = 0; j < storageResult.identityCollection.number; j++) { 170 vI.notificationBar.dump("## storage: updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n");172 MyLog.debug("## storage: updateVIdentityFromStorage adding: " + storageResult.identityCollection.identityDataCollection[j].combinedName + "\n"); 171 173 selectedMenuItem = document.getElementById("msgIdentity_clone").addIdentityToCloneMenu(storageResult.identityCollection.identityDataCollection[j]) 172 174 } 173 175 } 174 176 if (storageResult.result == "accept") { 175 vI.notificationBar.dump("## storage: updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n");177 MyLog.debug("## storage: updateVIdentityFromStorage selecting: " + storageResult.identityCollection.identityDataCollection[0].combinedName + "\n"); 176 178 document.getElementById("msgIdentity_clone").selectedMenuItem = selectedMenuItem; 177 179 if (document.getElementById("msgIdentity_clone").vid) 178 vI.notificationBar.setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".",180 setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".", 179 181 "storage_notification"); 180 182 } … … 189 191 for (var index = 0; index < doBccArray.count; index++ ) { 190 192 if (doBccArray.StringAt(index) == awGetInputElement(row).value) { 191 vI.notificationBar.dump("## storage: ignoring doBcc field '" +193 MyLog.debug("## storage: ignoring doBcc field '" + 192 194 doBccArray.StringAt(index) + "'.\n"); 193 195 return true; -
content/vI_storageExtras.js
r67fe6b r021dbf 90 90 loopForRDF : function(rdfDatasource, resource, type) { 91 91 for( var i = 0; i < this.extras.length; i++ ) { 92 // if (vI.notificationBar) vI.notificationBar.dump("## vI.rdfDatasource: loopForRDF " + rdfDatasource + "\n");92 // MyLog.debug("## vI.rdfDatasource: loopForRDF " + rdfDatasource + "\n"); 93 93 // only if pref set and feature(element available) or for dataEditor 94 94 if (typeof(gMsgCompose) == "undefined" || !gMsgCompose || this.extras[i].active) { … … 167 167 for( var i = 0; i < this.extras.length; i++ ) { 168 168 if (this.extras[i].active) this.extras[i].readIdentityValue(identity) 169 // vI.notificationBar.dump("## storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");169 // MyLog.debug("## storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n"); 170 170 } 171 171 }, … … 174 174 for( var i = 0; i < this.extras.length; i++ ) { 175 175 if (this.extras[i].active) this.extras[i].setValue() 176 // vI.notificationBar.dump("## storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");176 // MyLog.debug("## storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n"); 177 177 } 178 178 }, 179 179 readValues : function() { 180 180 for( var i = 0; i < this.extras.length; i++ ) { 181 // vI.notificationBar.dump("## storageExtras preparing readValue "+ this.extras[i].field +"\n");181 // MyLog.debug("## storageExtras preparing readValue "+ this.extras[i].field +"\n"); 182 182 if (this.extras[i].active) this.extras[i].readValue() 183 // vI.notificationBar.dump("## storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");183 // MyLog.debug("## storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n"); 184 184 } 185 185 }, … … 190 190 for( var i = 0; i < this.extras.length; i++ ) { 191 191 this.extras[i].readEditorValue(); 192 // vI.notificationBar.dump("## storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");192 // MyLog.debug("## storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n"); 193 193 } 194 194 }, … … 376 376 // function to set or read the value from/to the MessageCompose Dialog 377 377 setValue : function() { 378 vI.notificationBar.dump("## storageExtras_sMime_messageEncryption \n");378 MyLog.debug("## storageExtras_sMime_messageEncryption \n"); 379 379 var doEncryptElem = document.getElementById("menu_securityEncryptRequire1"); 380 380 if (this.value == null) return; … … 458 458 459 459 if ((element.getAttribute("checked") == "true") != (this.value == "true")) { 460 vI.notificationBar.dump("## storageExtras change "+ this.field + " to " + this.value + " with doCommand\n");460 MyLog.debug("## storageExtras change "+ this.field + " to " + this.value + " with doCommand\n"); 461 461 element.doCommand(); 462 462 } -
content/vI_upgrade.js
r67fe6b r021dbf 44 44 45 45 __initRequirements : function() { 46 vI.notificationBar.dump("") // this initialises the debug-area46 MyLog.debug("") // this initialises the debug-area 47 47 upgrade.rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf", true); 48 48 }, … … 67 67 // don't show the dialog if we do a one-step upgrade 68 68 if (upgrade.versionChecker.compare(extVersion, nextVersion) <= 0) { 69 vI.notificationBar.dump("starting quick_upgrade.\n")69 MyLog.debug("starting quick_upgrade.\n") 70 70 upgrade.__initRequirements(); 71 71 upgrade.__upgrade(); … … 92 92 93 93 upgrade : function() { 94 vI.notificationBar.dump("starting upgrade.\n\n")94 MyLog.debug("starting upgrade.\n\n") 95 95 document.getElementById("upgradeWizard").setAttribute("canAdvance", "false") 96 96 document.documentElement.getButton('next').setAttribute('disabled','true'); … … 98 98 upgrade.__upgrade(); 99 99 100 vI.notificationBar.dump("\n\nupgrade finished.\n");100 MyLog.debug("\n\nupgrade finished.\n"); 101 101 102 102 document.documentElement.getButton('next').setAttribute('disabled','false'); … … 106 106 extUpgrade : function() { 107 107 var currentVersion = upgrade.rdfDatasource.getCurrentExtFileVersion(); 108 vI.notificationBar.dump("checking for previous version, found " +108 MyLog.debug("checking for previous version, found " + 109 109 currentVersion + "\nextension-upgrade required.\n") 110 110 switch (currentVersion) { … … 117 117 } 118 118 upgrade.rdfDatasource.storeExtVersion(); 119 vI.notificationBar.dump("extension-upgrade to " + upgrade.rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");119 MyLog.debug("extension-upgrade to " + upgrade.rdfDatasource.getCurrentExtFileVersion() + " done.\n\n"); 120 120 }, 121 121 … … 125 125 .getBranch(null); 126 126 127 vI.notificationBar.dump("extension-upgrade __removeExtraAddedHeaders " + currentVersion + "\n");127 MyLog.debug("extension-upgrade __removeExtraAddedHeaders " + currentVersion + "\n"); 128 128 if ((!currentVersion || upgrade.versionChecker.compare(currentVersion, "0.6.9") < 0) && 129 129 prefroot.getCharPref("mailnews.headers.extraExpandedHeaders") != "") { 130 130 // clean extraExpandedHeaders once, because the whole header-saving and restoring was broken too long 131 vI.notificationBar.dump("cleaning extraExpandedHeaders\n");131 MyLog.debug("cleaning extraExpandedHeaders\n"); 132 132 prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", "") 133 vI.notificationBar.dump("cleaned extraExpandedHeaders\n");133 MyLog.debug("cleaned extraExpandedHeaders\n"); 134 134 } 135 vI.notificationBar.dump("extension-upgrade __removeExtraAddedHeaders done.\n\n");135 MyLog.debug("extension-upgrade __removeExtraAddedHeaders done.\n\n"); 136 136 }, 137 137 … … 150 150 if (!currentVersion || (upgrade.versionChecker.compare(currentVersion, transferPrefs[i].version) < 0)) { 151 151 // remove any obsolete preferences under extensions.virtualIdentity 152 vI.notificationBar.dump("transfer changed preferences of pre-" + transferPrefs[i].version + " release:\n")152 MyLog.debug("transfer changed preferences of pre-" + transferPrefs[i].version + " release:\n") 153 153 for each (transferPref in transferPrefs[i].prefs) { 154 154 try { upgrade.preferences.setBoolPref(transferPref.targetPref, 155 155 upgrade.preferences.getBoolPref(transferPref.sourcePref)); 156 156 upgrade.preferences.clearUserPref(transferPref.sourcePref); 157 vI.notificationBar.dump(".")157 MyLog.debug(".") 158 158 } 159 159 catch (e) { }; 160 160 } 161 vI.notificationBar.dump("done.\n")161 MyLog.debug("done.\n") 162 162 } 163 163 } … … 183 183 if (!currentVersion || (upgrade.versionChecker.compare(currentVersion, obsoletePrefs[i].version) < 0)) { 184 184 // remove any obsolete preferences under extensions.virtualIdentity 185 vI.notificationBar.dump("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release:\n")185 MyLog.debug("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release:\n") 186 186 for each (pref in obsoletePrefs[i].prefs) { 187 try { upgrade.preferences.clearUserPref(pref); vI.notificationBar.dump(".") }187 try { upgrade.preferences.clearUserPref(pref); MyLog.debug(".") } 188 188 catch (e) { }; 189 189 } 190 vI.notificationBar.dump("done.\n")190 MyLog.debug("done.\n") 191 191 } 192 192 } -
content/vI_upgrade.xul
r67fe6b r021dbf 46 46 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_identityData.js" /> 47 47 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_helper.js" /> 48 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>49 48 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_rdfDatasource.js" /> 50 49 <script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" /> … … 89 88 <groupbox> 90 89 <caption label="&vident.upgrade.upgrade.caption;"/> 91 <textbox id="vIDebugBox" upgrade="true" multiline="true" readonly="true"/>90 <textbox id="vIDebugBox" /> 92 91 </groupbox> 93 92 </wizardpage> -
content/vI_upgradeOverlay.xul
r67fe6b r021dbf 38 38 <script type="application/x-javascript" src="chrome://v_identity/content/_overlayNameSpaceWrapper.js" /> 39 39 40 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>41 40 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_account.js" /> 42 41 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_rdfDatasource.js" /> -
content/v_identity.js
r67fe6b r021dbf 24 24 25 25 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 26 26 27 var main = { 27 28 preferences : Components.classes["@mozilla.org/preferences-service;1"] … … 63 64 ComposeStateListener : { 64 65 NotifyComposeBodyReady: function() { 65 vI.notificationBar.dump("## v_identity: NotifyComposeBodyReady\n");66 MyLog.debug("## v_identity: NotifyComposeBodyReady\n"); 66 67 main.initSystemStage2(); 67 68 }, 68 69 NotifyComposeFieldsReady: function() { 69 vI.notificationBar.dump("## v_identity: NotifyComposeFieldsReady\n");70 MyLog.debug("## v_identity: NotifyComposeFieldsReady\n"); 70 71 }, 71 72 ComposeProcessDone: function(aResult) { 72 vI.notificationBar.dump("## v_identity: StateListener reports ComposeProcessDone\n");73 MyLog.debug("## v_identity: StateListener reports ComposeProcessDone\n"); 73 74 main.Cleanup(); // not really required, parallel handled by main.close 74 75 vI.storage.clean(); 75 76 }, 76 77 SaveInFolderDone: function(folderURI) { 77 vI.notificationBar.dump("## v_identity: SaveInFolderDone\n");78 MyLog.debug("## v_identity: SaveInFolderDone\n"); 78 79 main.Cleanup(); 79 80 vI.storage.clean(); … … 83 84 replacement_functions : { 84 85 FillIdentityList: function(menulist) { 85 vI.notificationBar.dump("## v_identity: mod. FillIdentityList\n");86 MyLog.debug("## v_identity: mod. FillIdentityList\n"); 86 87 var accounts = queryISupportsArray(main.accountManager.accounts, 87 88 Components.interfaces.nsIMsgAccount); … … 135 136 vI.storage.awOnBlur(vI.storage.focusedElement); 136 137 137 vI.notificationBar.dump("\n## v_identity: VIdentity_GenericSendMessage\n");138 MyLog.debug("\n## v_identity: VIdentity_GenericSendMessage\n"); 138 139 139 140 if (msgType == Components.interfaces.nsIMsgCompDeliverMode.Now) { vI.msgIdentityCloneTools.addReplyToSelf(); } … … 147 148 if (returnValue.update == "abort") { 148 149 main.replacement_functions.GenericSendMessageInProgress = false; 149 vI.notificationBar.dump("## sending: -------------- aborted ---------------------------------\n")150 MyLog.debug("## sending: -------------- aborted ---------------------------------\n") 150 151 return; 151 152 } … … 154 155 msgIdentityCloneElem.selectedMenuItem = msgIdentityCloneElem.addIdentityToCloneMenu(returnValue.storedIdentity); 155 156 main.replacement_functions.GenericSendMessageInProgress = false; 156 vI.notificationBar.dump("## sending: -------------- aborted ---------------------------------\n")157 MyLog.debug("## sending: -------------- aborted ---------------------------------\n") 157 158 return; 158 159 } … … 167 168 else main.Cleanup(); 168 169 main.replacement_functions.GenericSendMessageInProgress = false; 169 // vI.notificationBar.dump("## v_identity: original_functions.GenericSendMessage done\n");170 // MyLog.debug("## v_identity: original_functions.GenericSendMessage done\n"); 170 171 }, 171 172 172 173 replace_FillIdentityList : function() { 173 //~ vI.notificationBar.dump("## v_identity: replace FillIdentityList \n");174 //~ MyLog.debug("## v_identity: replace FillIdentityList \n"); 174 175 main.original_functions.FillIdentityList = FillIdentityList; 175 176 FillIdentityList = main.replacement_functions.FillIdentityList; … … 180 181 window.removeEventListener('compose-window-reopen', main.reopen, true); 181 182 window.removeEventListener('compose-window-close', main.close, true); 182 vI.notificationBar.dump("## v_identity: end. remove Account if there.\n")183 MyLog.debug("## v_identity: end. remove Account if there.\n") 183 184 main.Cleanup(); 184 185 vI.storage.clean(); … … 204 205 for (var index = 0; index < doBccArray.count; index++ ) { 205 206 if (doBccArray.StringAt(index) == awGetInputElement(row).value) { 206 vI.notificationBar.dump("## main _recipientIsDoBcc: ignoring doBcc field '" +207 MyLog.debug("## main _recipientIsDoBcc: ignoring doBcc field '" + 207 208 doBccArray.StringAt(index) + "'.\n"); 208 209 return true; … … 217 218 window.removeEventListener('compose-window-init', main.init, true); 218 219 if (main.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen) 219 vI.notificationBar.dump("\n## v_identity: init.\n")220 MyLog.debug("\n## v_identity: init.\n") 220 221 main.unicodeConverter.charset="UTF-8"; 221 if (!main.adapt_genericSendMessage()) { vI.notificationBar.dump("\n## v_identity: init failed.\n"); return; }222 if (!main.adapt_genericSendMessage()) { MyLog.debug("\n## v_identity: init failed.\n"); return; } 222 223 223 224 main.adapt_interface(); … … 234 235 235 236 main.initSystemStage1(); 236 vI.notificationBar.dump("## v_identity: init done.\n\n")237 MyLog.debug("## v_identity: init done.\n\n") 237 238 }, 238 239 239 240 initSystemStage1 : function() { 240 vI.notificationBar.dump("## v_identity: initSystemStage1.\n")241 MyLog.debug("## v_identity: initSystemStage1.\n") 241 242 main.gMsgCompose = gMsgCompose; 242 243 document.getElementById("msgIdentity_clone").init(); 243 244 vI.statusmenu.init(); 244 vI.notificationBar.dump("## v_identity: initSystemStage1 done.\n")245 MyLog.debug("## v_identity: initSystemStage1 done.\n") 245 246 }, 246 247 247 248 initSystemStage2 : function() { 248 vI.notificationBar.dump("## v_identity: initSystemStage2.\n")249 MyLog.debug("## v_identity: initSystemStage2.\n") 249 250 vI.msgIdentityCloneTools.initReplyTo(); 250 251 vI.storage.init(); 251 252 vI.smartIdentity.init(); 252 vI.notificationBar.dump("## v_identity: initSystemStage2 done.\n")253 MyLog.debug("## v_identity: initSystemStage2 done.\n") 253 254 }, 254 255 … … 286 287 adapt_genericSendMessage : function() { 287 288 if (main.original_functions.GenericSendMessage) return true; // only initialize this once 288 vI.notificationBar.dump("## v_identity: adapt GenericSendMessage\n");289 MyLog.debug("## v_identity: adapt GenericSendMessage\n"); 289 290 main.original_functions.GenericSendMessage = GenericSendMessage; 290 291 GenericSendMessage = main.replacement_functions.GenericSendMessage; … … 293 294 294 295 reopen: function() { 295 vI.notificationBar.clear();296 vI.notificationBar.clear_dump();297 vI.notificationBar.dump("## v_identity: composeDialog reopened. (msgType " + gMsgCompose.type + ")\n")296 clearNote(); 297 clearDebugOutput(); 298 MyLog.debug("## v_identity: composeDialog reopened. (msgType " + gMsgCompose.type + ")\n") 298 299 299 300 // clean all elements 300 301 document.getElementById("msgIdentity_clone").clean(); 301 vI.notificationBar.dump("## v_identity: everything cleaned.\n")302 MyLog.debug("## v_identity: everything cleaned.\n") 302 303 303 304 // now (re)init the elements … … 326 327 gMsgCompose.RegisterStateListener(main.ComposeStateListener); 327 328 } 328 vI.notificationBar.dump("## v_identity: reopen done.\n")329 MyLog.debug("## v_identity: reopen done.\n") 329 330 }, 330 331 … … 383 384 observe : function(subject, topic, data) { 384 385 if (topic == "am-smtpChanges") { 385 vI.notificationBar.dump("## v_identity: smtp changes observed\n");386 MyLog.debug("## v_identity: smtp changes observed\n"); 386 387 var msgIdentity_clone = document.getElementById("msgIdentity_clone"); 387 388 document.getAnonymousElementByAttribute(msgIdentity_clone, "class", "smtpServerListHbox").refresh(); 388 389 } 389 390 if (topic == "am-acceptChanges") { 390 vI.notificationBar.dump("## v_identity: account changes observed\n");391 MyLog.debug("## v_identity: account changes observed\n"); 391 392 document.getElementById("msgIdentity_clone").clean(); 392 393 document.getElementById("msgIdentity_clone").init(); -
content/v_identity.xul
r67fe6b r021dbf 48 48 <script type="application/x-javascript" src="chrome://v_identity/content/vI_smartIdentity.js" /> 49 49 <script type="application/x-javascript" src="chrome://v_identity/content/vI_statusmenu.js" /> 50 <script type="application/x-javascript" src="chrome://v_identity/content/notificationbar/vI_notificationBar.js"/>51 50 <script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js"/> 52 51 <script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js"/> … … 58 57 59 58 <vbox id="appcontent" > 60 <splitter id="vIDebugBoxSplitter" hidden="true"/> 61 <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true" 62 DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/> 59 <textbox id="vIDebugBox" /> 63 60 </vbox> 64 61 -
skin/v_identity.css
r67fe6b r021dbf 310 310 311 311 #vINotification { 312 -moz-binding: url("chrome:// v_identity/content/notificationbar/vI_notificationBar.xml#vI_notificationbox");312 -moz-binding: url("chrome://global/content/bindings/notification.xml#notificationbox"); 313 313 -moz-box-orient: vertical; 314 314 overflow: hidden; … … 316 316 317 317 #vINotification notification { 318 -moz-binding: url("chrome:// v_identity/content/notificationbar/vI_notificationBar.xml#vI_notification");318 -moz-binding: url("chrome://global/content/bindings/notification.xml#notification"); 319 319 } 320 320 … … 324 324 } 325 325 326 #vIDebugBox { 327 -moz-binding: url("chrome://v_identity/content/bindings/vI_debugBox.xml#vI_debugBox"); 328 } 329 326 330 #vIDebugBox, #vIErrorBox{ 327 328 329 331 overflow: auto; 332 font-size: x-small; 333 height: 10em; 330 334 } 331 335 332 336 .identity_clone-menulist { 333 -moz-binding: url( chrome://v_identity/content/bindings/v_identity.xml#fromMenuList_clone);337 -moz-binding: url("chrome://v_identity/content/bindings/v_identity.xml#fromMenuList_clone"); 334 338 -moz-appearance: textfield; 335 339 margin: 2px 4px;
Note: See TracChangeset
for help on using the changeset viewer.