From 08f2c6cd42913f678062223635843786ee05b2f3 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Wed, 22 Dec 1999 08:37:30 +0000
Subject: [PATCH] fix the pref ui a little, fix a js exception, add a label to
 the spell checking field set, add ui for emoticon to glyph conversion.  part
 1 of fix for #21649

---
 .../prefs/resources/content/pref-addressing.xul       |  4 +++-
 .../compose/prefs/resources/content/pref-messages.xul | 11 +++++++++++
 .../prefs/resources/locale/en-US/pref-messages.dtd    |  3 +++
 mailnews/mailnews.js                                  |  1 +
 modules/libpref/src/init/mailnews.js                  |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index fc24ec7b451..f5a417c1e41 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/pref-addressing.dtd">
 
@@ -9,6 +9,8 @@
         class="dialog"
 		align="vertical">
 
+<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+
 	<box class="header" align="horizontal">
 		<html:div class="left-header-text">&pane.title;</html:div>
 		<spring flex="100%"/>
diff --git a/mailnews/compose/prefs/resources/content/pref-messages.xul b/mailnews/compose/prefs/resources/content/pref-messages.xul
index b75af16b21e..8c9e57badaf 100644
--- a/mailnews/compose/prefs/resources/content/pref-messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-messages.xul
@@ -47,6 +47,10 @@
 	</html:fieldset>
 
 	<html:fieldset>
+		<html:legend align="left">
+                        <html:div>&spellCheckHeader.label;</html:div>
+                </html:legend>
+
 		<html:input id="pref:0:bool:mail.SpellCheckBeforeSend" type="checkbox"/>
 		<html:label for="pref:0:bool:mail.SpellCheckBeforeSend">&spellCheck.label;</html:label>
 	</html:fieldset>
@@ -85,5 +89,12 @@
 		<html:div class="indent">&useMIMEpart2.label;</html:div>
 
 	</html:fieldset>
+	 <html:fieldset>
+                <html:legend align="left">
+                        <html:div>&emoticons.label;</html:div>
+                </html:legend>
+		<html:input id="pref:0:bool:mail.enable_emoticons" type="checkbox"/>
+		<html:label for="pref:0:bool:mail.enable_emoticons">&enableEmoticons.label;</html:label>
+	</html:fieldset>
 
 </window>
diff --git a/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd b/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
index 5042b96c527..73e9dc1afc9 100644
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
@@ -31,6 +31,7 @@ Rights Reserved.
 <!ENTITY belowQuote.label "start my reply below the quoted text">
 <!ENTITY selectAndAboveQuote.label "start my reply above, and select the quoted text">
 <!ENTITY selectAndBelowQuote.label "start my reply below, and select the quoted text">
+<!ENTITY spellCheckHeader.label "Spell checking">
 <!ENTITY spellCheck.label "Spell check messages before sending">
 <!ENTITY msgWrapping.label "Message Wrapping">
 <!ENTITY wrapInMsg.label "Wrap incoming, plain text messages to window width">
@@ -41,3 +42,5 @@ Rights Reserved.
 <!ENTITY asIs.label "As is (does not work well with some mail servers)">
 <!ENTITY useMIMEpart1.label "Using the 'quoted printable' MIME encoding">
 <!ENTITY useMIMEpart2.label "(does not work well with some mail or newsgroups readers)">
+<!ENTITY emoticons.label "Emoticons">
+<!ENTITY enableEmoticons.label "When viewing a text message, convert emoticons to glyphs.">
diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
index 3ae220c60a4..020b9217799 100644
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -363,3 +363,4 @@ pref("mail.server.default.max_size", 50);
 pref("mail.server.default.auth_login", true);
 pref("mail.server.default.delete_mail_left_on_server", false);
 
+pref("mail.enable_emoticons",true);
diff --git a/modules/libpref/src/init/mailnews.js b/modules/libpref/src/init/mailnews.js
index 3ae220c60a4..020b9217799 100644
--- a/modules/libpref/src/init/mailnews.js
+++ b/modules/libpref/src/init/mailnews.js
@@ -363,3 +363,4 @@ pref("mail.server.default.max_size", 50);
 pref("mail.server.default.auth_login", true);
 pref("mail.server.default.delete_mail_left_on_server", false);
 
+pref("mail.enable_emoticons",true);