From c0341cb4a647ee3d49fcd91345843ec08d085f0e Mon Sep 17 00:00:00 2001 From: Jonas Date: Wed, 19 Feb 2014 03:04:19 +0100 Subject: [PATCH] Only 2 warnings left from the validator, thats fine by me. Time to submit to Mozilla --- chrome/content/composeOverlay.js | 2 +- chrome/content/messageWindowOverlay.js | 16 ++++---- chrome/content/pennyPostOptions.js | 4 +- chrome/content/pennyPostOptions.xul | 52 +++++++++++++------------- chrome/content/ppost.js | 8 ++-- chrome/content/stampProgress.js | 2 +- defaults/preferences/ppost.js | 20 +++++----- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/chrome/content/composeOverlay.js b/chrome/content/composeOverlay.js index e39a826..055094c 100644 --- a/chrome/content/composeOverlay.js +++ b/chrome/content/composeOverlay.js @@ -128,7 +128,7 @@ function msSendMsg() { * Format is x-stampprotocols: //[/][/];//[/][/] */ function getStampProtocolHeader(){ - var mb = 'mbound:'+Services.prefs.getIntPref('extensions.ppost.mbound.maxver')+':'+Services.prefs.getIntPref('extensions.ppost.mbound.minvalue')+':'+Services.prefs.getIntPref('ppost.mbound.minpath')+':'+Services.prefs.getIntPref('ppost.mbound.maxpath'); + var mb = 'mbound:'+Services.prefs.getIntPref('extensions.ppost.mbound.maxver')+':'+Services.prefs.getIntPref('extensions.ppost.mbound.minvalue')+':'+Services.prefs.getIntPref('extensions.ppost.mbound.minpath')+':'+Services.prefs.getIntPref('extensions.ppost.mbound.maxpath'); var hc = 'hashcash:'+Services.prefs.getIntPref('extensions.ppost.hashcash.maxver')+':'+Services.prefs.getIntPref('extensions.ppost.hashcash.minvalue'); var rv=''; var defalgo=Services.prefs.getCharPref('extensions.ppost.defalgo'); diff --git a/chrome/content/messageWindowOverlay.js b/chrome/content/messageWindowOverlay.js index 8fa16eb..6c59d47 100644 --- a/chrome/content/messageWindowOverlay.js +++ b/chrome/content/messageWindowOverlay.js @@ -117,8 +117,8 @@ function verifyStamp() //Read all prefs var hcminval=Services.prefs.getIntPref('extensions.ppost.hashcash.minvalue'); var mbminval=Services.prefs.getIntPref('extensions.ppost.mbound.minvalue'); - var minpath=Services.prefs.getIntPref('ppost.mbound.minpath'); - var maxpath=Services.prefs.getIntPref('ppost.mbound.maxpath'); + var minpath=Services.prefs.getIntPref('extensions.ppost.mbound.minpath'); + var maxpath=Services.prefs.getIntPref('extensions.ppost.mbound.maxpath'); var elmIcon=document.getElementById('ppostIcon'); @@ -160,7 +160,7 @@ function verifyStamp() elmIcon.src="chrome://ppost/skin/wrpostage.png"; elmIcon.tooltipText = gStrBundle.getString("error_invalidtip"); - var autojunk=Services.prefs.getBoolPref('ppost.automarkjunk'); + var autojunk=Services.prefs.getBoolPref('extensions.ppost.automarkjunk'); //message is junk if(!SelectedMessagesAreJunk() && autojunk){ JunkSelectedMessages(true); @@ -263,8 +263,8 @@ function localVerify(sHeaderDate){ //check if stamp values match our preferences var hcminval=Services.prefs.getIntPref('extensions.ppost.hashcash.minvalue'); var mbminval=Services.prefs.getIntPref('extensions.ppost.mbound.minvalue'); - var minpath=Services.prefs.getIntPref('ppost.mbound.minpath'); - var maxpath=Services.prefs.getIntPref('ppost.mbound.maxpath'); + var minpath=Services.prefs.getIntPref('extensions.ppost.mbound.minpath'); + var maxpath=Services.prefs.getIntPref('extensions.ppost.mbound.maxpath'); switch(gobStamp.iType){ case gStampTypes.HASHCASH: @@ -283,7 +283,7 @@ function localVerify(sHeaderDate){ break; } - var skipchkdate=Services.prefs.getBoolPref('ppost.skip_date_verification2'); + var skipchkdate=Services.prefs.getBoolPref('extensions.ppost.skip_date_verification2'); if(!skipchkdate){ @@ -311,7 +311,7 @@ function localVerify(sHeaderDate){ localDt.setUTCMilliseconds(0); //check if stamp is recent - if(Math.round(Math.abs(gobStamp.dtGen-localDt)/86400000)>Services.prefs.getIntPref('ppost.maxagedays')){ + if(Math.round(Math.abs(gobStamp.dtGen-localDt)/86400000)>Services.prefs.getIntPref('extensions.ppost.maxagedays')){ gobStamp.bError=true; gobStamp.sError = gStrBundle.getString("error_stale"); return true; @@ -520,7 +520,7 @@ function updateStamp(){ if(gobStamp.bError){ elmIcon.src = "chrome://ppost/skin/wrpostage.png"; elmIcon.tooltipText=gobStamp.sError; - var autojunk=Services.prefs.getBoolPref('ppost.automarkjunk'); + var autojunk=Services.prefs.getBoolPref('extensions.ppost.automarkjunk'); //message is junk as the stamp is invalid if(!SelectedMessagesAreJunk() && autojunk){ JunkSelectedMessages(true); diff --git a/chrome/content/pennyPostOptions.js b/chrome/content/pennyPostOptions.js index e80e414..42d08f8 100644 --- a/chrome/content/pennyPostOptions.js +++ b/chrome/content/pennyPostOptions.js @@ -40,7 +40,7 @@ function initDlg() { dialog = new Object; dialog.ppost = document.getElementById("extensions.ppost.path.box"); - dialog.javapath = document.getElementById("ppost.javapath.box"); + dialog.javapath = document.getElementById("extensions.ppost.javapath.box"); dialog.hc_enable = document.getElementById("extensions.ppost.hashcash.enable"); dialog.mb_enable = document.getElementById("extensions.ppost.mbound.enable"); dialog.def_algo = document.getElementById("extensions.ppost.defalgo"); @@ -146,7 +146,7 @@ function onBrowseJava(){ var rv=filePickerDlg.show(); if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) { dialog.javapath.value=filePickerDlg.file.path; - prefs.setCharPref('ppost.javapath', dialog.javapath.value); + prefs.setCharPref('extensions.ppost.javapath', dialog.javapath.value); } } diff --git a/chrome/content/pennyPostOptions.xul b/chrome/content/pennyPostOptions.xul index f2e2db6..f566be4 100644 --- a/chrome/content/pennyPostOptions.xul +++ b/chrome/content/pennyPostOptions.xul @@ -39,11 +39,11 @@ - - +