зеркало из https://github.com/mozilla/gecko-dev.git
back out some files which were accidentally checked in
This commit is contained in:
scott%scott-macgregor.org
Родитель
26c89e440c
Коммит
f8118d0756
|
|
@ -14,8 +14,6 @@ messenger.jar:
|
|||
* content/messenger/preferences/privacy.js
|
||||
* content/messenger/preferences/viewpasswords.js
|
||||
* content/messenger/preferences/viewpasswords.xul
|
||||
* content/messenger/preferences/junkLog.xul
|
||||
* content/messenger/preferences/junkLog.js
|
||||
* content/messenger/preferences/advanced.js
|
||||
* content/messenger/preferences/advanced.xul
|
||||
* content/messenger/preferences/receipts.xul
|
||||
|
|
@ -63,8 +61,6 @@ messenger.jar:
|
|||
content/messenger/am-identity-edit.js (/mailnews/base/prefs/resources/content/am-identity-edit.js)
|
||||
content/messenger/am-identity-edit.xul (/mailnews/base/prefs/resources/content/am-identity-edit.xul)
|
||||
content/messenger/am-copiesOverlay.xul (/mailnews/base/prefs/resources/content/am-copiesOverlay.xul)
|
||||
* content/messenger/am-junk.xul (/mailnews/base/prefs/resources/content/am-junk.xul)
|
||||
* content/messenger/am-junk.js (/mailnews/base/prefs/resources/content/am-junk.js)
|
||||
content/messenger/AccountWizard.xul (/mailnews/base/prefs/resources/content/AccountWizard.xul)
|
||||
content/messenger/AccountWizard.js (/mailnews/base/prefs/resources/content/AccountWizard.js)
|
||||
content/messenger/aw-accounttype.js (/mailnews/base/prefs/resources/content/aw-accounttype.js)
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is the Thunderbird Preferences System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Scott MacGregor.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2006
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Scott MacGregor <mscott@mozilla.org>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
var gLogView;
|
||||
var gLogFile;
|
||||
|
||||
function onLoad()
|
||||
{
|
||||
gLogView = document.getElementById("logView");
|
||||
gLogView.docShell.allowJavascript = false; // for security, disable JS
|
||||
|
||||
var directoryService = Components.classes["@mozilla.org/file/directory_service;1"]
|
||||
.getService(Components.interfaces.nsIProperties);
|
||||
gLogFile = directoryService.get("ProfD", Components.interfaces.nsIFile);
|
||||
gLogFile.append("junklog.html");
|
||||
|
||||
if (gLogFile.exists())
|
||||
{
|
||||
// convert the file to a URL so we can load it.
|
||||
ioService = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
gLogView.setAttribute("src", ioService.newFileURI(gLogFile).spec);
|
||||
}
|
||||
}
|
||||
|
||||
function clearLog()
|
||||
{
|
||||
if (gLogFile.exists())
|
||||
{
|
||||
gLogFile.remove(false);
|
||||
gLogView.setAttribute("src", "about:blank"); // we don't have a log file to show
|
||||
}
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is the Thunderbird Preferences System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Scott MacGregor.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2006
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Scott MacGregor <mscott@mozilla.org>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/preferences/junkLog.dtd">
|
||||
|
||||
<dialog id="viewLogWindow"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="onLoad();"
|
||||
title="&junkLog.title;"
|
||||
windowtype="mailnews:junklog"
|
||||
buttons="accept"
|
||||
buttonlabelaccept="&closeLog.label;"
|
||||
buttonaccesskeyaccept="&closeLog.accesskey;"
|
||||
ondialogaccept="window.close()"
|
||||
persist="screenX screenY width height"
|
||||
style="width: 40em; height: 25em;">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/preferences/junkLog.js"/>
|
||||
|
||||
<vbox flex="1">
|
||||
<hbox>
|
||||
<label value="&junkLogInfo.label;"/>
|
||||
<spacer flex="1"/>
|
||||
<button label="&clearLog.label;" accesskey="&clearLog.accesskey;" oncommand="clearLog()"/>
|
||||
</hbox>
|
||||
<vbox flex="1">
|
||||
<spacer height="10px"/>
|
||||
<hbox flex="1">
|
||||
<spacer width="10px"/>
|
||||
<browser id="logView" disablehistory="true" disablesecurity="true" src="about:blank" autofind="false" flex="1"/>
|
||||
<spacer width="10px"/>
|
||||
</hbox>
|
||||
<spacer height="10px"/>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</dialog>
|
||||
|
|
@ -45,9 +45,6 @@ var gPrivacyPane = {
|
|||
this.mPane = document.getElementById("panePrivacy");
|
||||
this.updateRemoteImagesState();
|
||||
|
||||
this.updateManualMarkMode(document.getElementById('manualMark').checked);
|
||||
this.updateJunkLogButton(document.getElementById('enableJunkLogging').checked);
|
||||
|
||||
// Update the MP buttons
|
||||
this.updateMasterPasswordButton();
|
||||
|
||||
|
|
@ -123,43 +120,6 @@ var gPrivacyPane = {
|
|||
}
|
||||
},
|
||||
|
||||
updateManualMarkMode: function(aEnableRadioGroup)
|
||||
{
|
||||
document.getElementById('manualMarkMode').disabled = !aEnableRadioGroup;
|
||||
},
|
||||
|
||||
updateJunkLogButton: function(aEnableButton)
|
||||
{
|
||||
document.getElementById('openJunkLogButton').disabled = !aEnableButton;
|
||||
},
|
||||
|
||||
openJunkLog: function()
|
||||
{
|
||||
document.documentElement.openWindow("mailnews:junklog", "chrome://messenger/content/preferences/junkLog.xul",
|
||||
"", null);
|
||||
},
|
||||
|
||||
resetTrainingData: function()
|
||||
{
|
||||
// make sure the user really wants to do this
|
||||
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
|
||||
.getService(Components.interfaces.nsIPromptService);
|
||||
var bundle = document.getElementById("bundlePreferences");
|
||||
var title = bundle.getString("confirmResetJunkTrainingTitle");
|
||||
var text = bundle.getString("confirmResetJunkTrainingText");
|
||||
|
||||
// if the user says no, then just fall out
|
||||
if (!promptService.confirm(window, title, text))
|
||||
return;
|
||||
|
||||
// otherwise go ahead and remove the training data
|
||||
var junkmailPlugin = Components.classes["@mozilla.org/messenger/filter-plugin;1?name=bayesianfilter"]
|
||||
.getService(Components.interfaces.nsIJunkMailPlugin);
|
||||
|
||||
if (junkmailPlugin)
|
||||
junkmailPlugin.resetTrainingData();
|
||||
},
|
||||
|
||||
initReencryptCallback: function()
|
||||
{
|
||||
var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
|
||||
|
|
|
|||
|
|
@ -69,15 +69,6 @@
|
|||
<preference id="javascript.allow.mailnews"
|
||||
name="javascript.allow.mailnews" inverted="true"
|
||||
type="bool"/>
|
||||
<preference id="mail.spam.manualMark"
|
||||
name="mail.spam.manualMark"
|
||||
type="bool"/>
|
||||
<preference id="mail.spam.manualMarkMode"
|
||||
name="mail.spam.manualMarkMode"
|
||||
type="int"/>
|
||||
<preference id="mail.spam.logging.enabled"
|
||||
name="mail.spam.logging.enabled"
|
||||
type="bool"/>
|
||||
<preference id="mail.phishing.detection.enabled"
|
||||
name="mail.phishing.detection.enabled"
|
||||
type="bool"/>
|
||||
|
|
@ -104,7 +95,6 @@
|
|||
<tabbox id="privacyPrefs" flex="1" onselect="gPrivacyPane.tabSelectionChanged();">
|
||||
<tabs>
|
||||
<tab label="&itemGeneral.label;"/>
|
||||
<tab label="&itemJunk.label;"/>
|
||||
<tab label="&itemPhishing.label;"/>
|
||||
<tab label="&itemAntiVirus.label;"/>
|
||||
<tab label="&itemPasswords.label;"/>
|
||||
|
|
@ -135,37 +125,6 @@
|
|||
preference="javascript.allow.mailnews"/>
|
||||
|
||||
</tabpanel>
|
||||
|
||||
<tabpanel orient="vertical">
|
||||
<description>&junkMail.intro;</description>
|
||||
<class separator="thin"/>
|
||||
|
||||
<checkbox id="manualMark"
|
||||
preference="mail.spam.manualMark"
|
||||
oncommand="gPrivacyPane.updateManualMarkMode(this.checked);"
|
||||
label="&manualMark.label;"/>
|
||||
|
||||
<radiogroup id="manualMarkMode" class="indent"
|
||||
preference="mail.spam.manualMarkMode">
|
||||
<radio id="manualMarkMode0" value="0" label="&manualMarkModeMove.label;"/>
|
||||
<radio id="manualMarkMode1" value="1" label="&manualMarkModeDelete.label;"/>
|
||||
</radiogroup>
|
||||
|
||||
<hbox align="start">
|
||||
<checkbox id="enableJunkLogging" label="&enableJunkLogging.label;"
|
||||
oncommand="gPrivacyPane.updateJunkLogButton(this.checked);"
|
||||
preference="mail.spam.logging.enabled"
|
||||
accesskey="&enableJunkLogging.accesskey;"/>
|
||||
<spacer flex="1"/>
|
||||
<button id="openJunkLogButton" label="&openJunkLog.label;" accesskey="&openJunkLog.accesskey;"
|
||||
oncommand="gPrivacyPane.openJunkLog();"/>
|
||||
</hbox>
|
||||
<hbox align="start">
|
||||
<spacer flex="1"/>
|
||||
<button label="&resetTrainingData.label;" accesskey="&resetTrainingData.accesskey;"
|
||||
oncommand="gPrivacyPane.resetTrainingData()"/>
|
||||
</hbox>
|
||||
</tabpanel>
|
||||
|
||||
<!-- Phishing Detector -->
|
||||
<tabpanel orient="vertical">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче