Second patch for Bug 229438 Support the "Find" and "Help" keys on Sun keyboard

make the new keybindings only available on X11 platform
r=bsmedberg, sr=mscott

editor/ui/composer/content/editorOverlay.xul

@@ -65,7 +65,9 @@
     <key id="findprevkb"        key="&editfindprev.keybinding;"        observes="cmd_findPrev"  modifiers="accel,shift"/>
     <key keycode="&editfindnext.keybinding2;" observes="cmd_findNext"/>
     <key keycode="&editfindprev.keybinding2;" observes="cmd_findPrev" modifiers="shift"/>
+#ifdef MOZ_X11
     <key keycode="&editfind.keybinding2;" observes="cmd_find"/>
+#endif
     <key id="checkspellingkb"
          key="&editcheckspelling.keybinding;"
          observes="cmd_spelling"

editor/ui/jar.mn

@@ -16,7 +16,7 @@ comm.jar:
       content/editor/EditorAllTags.css                         (composer/content/EditorAllTags.css) 
       content/editor/EditorParagraphMarks.css                  (composer/content/EditorParagraphMarks.css)
       content/editor/EditorContent.css                         (composer/content/EditorContent.css)  
-      content/editor/editorOverlay.xul                         (composer/content/editorOverlay.xul) 
+*     content/editor/editorOverlay.xul                         (composer/content/editorOverlay.xul) 
       content/editor/editorOverlay.js                          (composer/content/editorOverlay.js) 
       content/editor/composerOverlay.xul                       (composer/content/composerOverlay.xul) 
       content/editor/pref-toolbars.xul                         (composer/content/pref-toolbars.xul) 

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -336,7 +336,9 @@ Rights Reserved.
   <key id="key_findPrev"  key="&findPrevCmd.key;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="accel, shift"/>
   <key keycode="&findAgainCmd.key2;"   oncommand="goDoCommand('cmd_findAgain')"/>
   <key keycode="&findPrevCmd.key2;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="shift"/>
+#ifdef MOZ_X11
   <key keycode="&findCmd.key2;"    oncommand="goDoCommand('cmd_find')"/>
+#endif
   <key id="key_findTypeText"/>
   <key id="key_findTypeLinks"/>
   <key id="key_stop" keycode="VK_ESCAPE" command="cmd_stop"/>

mailnews/jar.mn

@@ -88,7 +88,7 @@ messenger.jar:
     content/messenger/messenger.xul                                            (base/resources/content/messenger.xul)
     content/messenger/mail3PaneWindowVertLayout.xul                            (base/resources/content/mail3PaneWindowVertLayout.xul)
     content/messenger/mailWindowExtrasOverlay.xul                              (base/resources/content/mailWindowExtrasOverlay.xul)
-    content/messenger/mailWindowOverlay.xul                                    (base/resources/content/mailWindowOverlay.xul)
+*   content/messenger/mailWindowOverlay.xul                                    (base/resources/content/mailWindowOverlay.xul)
     content/messenger/mailWindowOverlay.js                                     (base/resources/content/mailWindowOverlay.js)
     content/messenger/msgSynchronize.xul                                       (base/resources/content/msgSynchronize.xul)
     content/messenger/msgSynchronize.js                                        (base/resources/content/msgSynchronize.js)

xpfe/browser/resources/content/navigatorOverlay.xul

@@ -86,7 +86,6 @@
     <key id="key_findPrev"   key="&findPrevCmd.commandkey;"       command="Browser:FindPrev"  modifiers="accel,shift"/>
     <key keycode="&findAgainCmd.commandkey2;" command="Browser:FindAgain"/>
     <key keycode="&findPrevCmd.commandkey2;"  command="Browser:FindPrev" modifiers="shift"/>
-    <key keycode="&findOnCmd.commandkey2;" command="Browser:Find"/>
     <key id="key_findTypeText"/>
     <key id="key_findTypeLinks"/>
 

xpfe/browser/resources/content/unix/platformNavigationBindings.xul

@@ -15,6 +15,9 @@
     <key key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
     <key key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
 
+    <!-- Specific keybinding for Sun keyboard -->
+    <key key="&findOnCmd.commandkey2;" command="Browser:Find"/>
+
     <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
     <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
     <key id="key_newTabWithTarget" keycode="VK_INSERT" command="cmd_newTabWithTarget"/>

xpfe/browser/resources/locale/en-US/navigator.dtd

@@ -121,7 +121,6 @@
 <!ENTITY findPrevCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
 <!ENTITY findPrevCmd.commandkey2 "VK_F3">
-<!ENTITY findOnCmd.commandkey2 "VK_F19">
 
 <!ENTITY searchInternetCmd.label "Search the Web">
 <!ENTITY searchInternetCmd.accesskey "S">

xpfe/browser/resources/locale/en-US/unix/platformNavigationBindings.dtd

@@ -1,7 +0,0 @@
-<!-- LOCALIZATION NOTE: RTL languages may wish to switch these -->
-<!ENTITY goBackCmd.keyCode "VK_LEFT">
-<!ENTITY goForwardCmd.keyCode "VK_RIGHT">
-<!ENTITY goBackCmd.commandKey "[">
-<!ENTITY goForwardCmd.commandKey "]">
-
-