Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 97055. Add an option for disabling remote images in mailnews. R=bhuvan, SR=alecf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@122430 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ducarroz%netscape.com 2002-05-31 18:43:23 +00:00
parent ecb82f94ae
commit 5d8a5ea68e
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
View File

@ -23,6 +23,9 @@
case "chrome://cookie/content/pref-cookies.xul":
_elementIDs.push("networkDisableCookieForMailNews");
break;
case "chrome://cookie/content/pref-images.xul":
_elementIDs.push("networkImageDisableImagesInMailNews");
break;
}
}
]]>
@ -49,6 +52,16 @@
preftype="bool" prefstring="network.cookie.disableCookieForMailNews"
insertafter="networkCookieBehaviorSeparator"/>
</page>
<!--- image toggle for mail/news -->
<groupbox id="imagesArea">
<checkbox id="networkImageDisableImagesInMailNews"
label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
observes="haveImageBlocking"
pref="true" preftype="bool" prefstring="mailnews.message_display.disable_remote_image"
prefattribute="checked" insertafter="networkImagesBehaviorSeparator"/>
</groupbox>
<!-- category tree entries for mail/news -->
<treechildren id="panelChildren">

3
mozilla/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
View File

@ -5,6 +5,9 @@
<!ENTITY disableCookieForMailNews.label "Disable cookies in Mail &amp; Newsgroups">
<!ENTITY disableCookieForMailNews.accesskey "m">
<!ENTITY disableImageInMailNews.label "Do not load remote images in Mail &amp; Newsgroup messages">
<!ENTITY disableImageInMailNews.accesskey "i">
<!ENTITY mail.label "Mail &amp; Newsgroups">
<!ENTITY mail.accesskey "m">
<!ENTITY address.label "Addressing">

6
mozilla/mailnews/base/resources/content/contents.rdf
View File

@ -23,6 +23,7 @@
<RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
<RDF:li resource="chrome://communicator/content/pref/pref-scripts.xul"/>
<RDF:li resource="chrome://cookie/content/pref-cookies.xul"/>
<RDF:li resource="chrome://cookie/content/pref-images.xul"/>
<RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
<RDF:li resource="chrome://messenger/content/messenger.xul"/>
<RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
@ -54,6 +55,11 @@
<RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
</RDF:Seq>
<!-- messenger image toggle pref -->
<RDF:Seq about="chrome://cookie/content/pref-images.xul">
<RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
</RDF:Seq>
<!-- messenger taskbar/tasks menu items -->
<RDF:Seq about="chrome://editor/content/editorTasksOverlay.xul">
<RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>

4
mozilla/mailnews/mailnews.js
View File

@ -427,4 +427,6 @@ pref("mailnews.customHeaders", "");
pref("mailnews.fakeaccount.show", false);
pref("mailnews.fakeaccount.server", "");
// message display properties
pref("mailnews.message_display.disable_remote_image", false);
pref("mailnews.message_display.allow.plugins", true);

4
mozilla/modules/libpref/src/init/mailnews.js
View File

@ -427,4 +427,6 @@ pref("mailnews.customHeaders", "");
pref("mailnews.fakeaccount.show", false);
pref("mailnews.fakeaccount.server", "");
// message display properties
pref("mailnews.message_display.disable_remote_image", false);
pref("mailnews.message_display.allow.plugins", true);