From b81d733d2a7523a2c34f29b63f22eea6f060acd4 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 21 Sep 2003 04:50:54 +0000
Subject: [PATCH] Bug 188934 Junk Mail Controls: J key for mark as junk,
 Shift-J for mark as not junk r=neil sr=dveditz

git-svn-id: svn://10.0.0.236/trunk@147097 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/resources/content/mailWindowOverlay.xul         | 9 +++++++++
 .../mailnews/base/resources/locale/en-US/messenger.dtd   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 5d6f0cc48b2..5c78ac46a04 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -302,6 +302,9 @@ Rights Reserved.
   <key id="key_selectThread" key="&selectThreadCmd.key;"             oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>
   
   <key id="key_toggleRead" key="&markAsReadCmd.key;"                 oncommand="goDoCommand('cmd_markAsRead');"/>
+  <key id="key_markJunk" key="&markAsJunkCmd.key;"                   oncommand="goDoCommand('cmd_markAsJunk');"/>
+  <key id="key_markNotJunk" key="&markAsNotJunkCmd.key;"             oncommand="goDoCommand('cmd_markAsNotJunk');"
+       modifiers="shift"/>
   <key id="key_markAllRead" key="&markAllReadCmd.key;"               oncommand="goDoCommand('cmd_markAllRead');" modifiers="accel, shift"/>
   <key id="key_markThreadAsRead" key="&markThreadAsReadCmd.key;"     oncommand="goDoCommand('cmd_markThreadAsRead')"/>
   <key id="key_markReadByDate" key="&markReadByDateCmd.key;"         oncommand="goDoCommand('cmd_markReadByDate')"/>
@@ -599,9 +602,11 @@ Rights Reserved.
                   observes="cmd_markAsFlagged"/>
         <menuseparator/>
         <menuitem label="&markAsJunkCmd.label;"
+                  key="key_markJunk"
                   accesskey="&markAsJunkCmd.accesskey;"
                   observes="cmd_markAsJunk"/>
         <menuitem label="&markAsNotJunkCmd.label;"
+                  key="key_markNotJunk"
                   accesskey="&markAsNotJunkCmd.accesskey;"
                   observes="cmd_markAsNotJunk"/>
       </menupopup>
@@ -941,9 +946,11 @@ Rights Reserved.
                   observes="cmd_markAsFlagged"/>
         <menuseparator/>
         <menuitem label="&markAsJunkCmd.label;" 
+                  key="key_markJunk"
                   accesskey="&markAsJunkCmd.accesskey;" 
                   observes="cmd_markAsJunk"/>
         <menuitem label="&markAsNotJunkCmd.label;" 
+                  key="key_markNotJunk"
                   accesskey="&markAsNotJunkCmd.accesskey;" 
                   observes="cmd_markAsNotJunk"/>
       </menupopup>
@@ -1532,9 +1539,11 @@ Rights Reserved.
                   observes="cmd_markAsFlagged"/>
         <menuseparator/>
         <menuitem label="&markAsJunkCmd.label;" 
+                  key="key_markJunk"
                   accesskey="&markAsJunkCmd.accesskey;" 
                   observes="cmd_markAsJunk"/>
         <menuitem label="&markAsNotJunkCmd.label;" 
+                  key="key_markNotJunk"
                   accesskey="&markAsNotJunkCmd.accesskey;" 
                   observes="cmd_markAsNotJunk"/>
       </menupopup>
diff --git a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
index ca2026d9ffe..cc2039deff4 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -395,8 +395,10 @@ Rights Reserved.
 <!ENTITY markFlaggedCmd.accesskey "F">
 <!ENTITY markAsJunkCmd.label "As Junk">
 <!ENTITY markAsJunkCmd.accesskey "J">
+<!ENTITY markAsJunkCmd.key "j">
 <!ENTITY markAsNotJunkCmd.label "As Not Junk">
 <!ENTITY markAsNotJunkCmd.accesskey "N">
+<!ENTITY markAsNotJunkCmd.key "j">
 <!ENTITY openMessageWindowCmd.label "Open Message">
 <!ENTITY openMessageWindowCmd.accesskey "O">
 <!ENTITY openMessageWindowCmd.key "o">