More on 11818 (xulkey): make meta the default mac xulkey,

since platformGlobalOverlay.xul isn't loaded. r=brade
Also fix the mac and unix platformGlobalOverlay files
for when platformGlobalOverlay.xul merging gets fixed.

rdf/content/src/nsXULKeyListener.cpp

@@ -287,7 +287,13 @@ nsXULKeyListenerImpl::Init(
     printf("nsXULKeyListenerImpl::Init()\n");
   element = aElement; // Weak reference. Don't addref it.
   mDOMDocument = aDocument; // Weak reference.
+
+  // Set the default for the xul key modifier
+#ifdef XP_MAC
+  mXULKeyModifier = xulKeyMeta;
+#else
   mXULKeyModifier = xulKeyControl;
+#endif
   return NS_OK;
 }
 

xpfe/global/resources/content/mac/platformGlobalOverlay.xul

@@ -8,10 +8,9 @@
 		 xmlns:html="http://www.w3.org/TR/REC-html40"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- change the xul key for Unix -->
-	<keyset id="unixoverlaykeyset">
-	<xulkey key="alt" />
-	<key keycode="VK_ENTER" oncommand="doOKButton()"/>
+	<!-- change the xul key for Mac -->
+	<keyset id="macoverlaykeyset">
+	<xulkey key="meta" />
 	</keyset>
 
 	<!-- close -->

xpfe/global/resources/content/unix/platformGlobalOverlay.xul

@@ -8,6 +8,11 @@
 		 xmlns:html="http://www.w3.org/TR/REC-html40"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+	<!-- change the xul key for Unix -->
+	<keyset id="unixoverlaykeyset">
+	<xulkey key="alt" />
+	</keyset>
+
 	<!-- close -->
 	<menuitem id="menu_close" value="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" observes="cmd_close"/>
 	<key id="key_close" xulkey="true" key="&closeCmd.key;" observes="cmd_close"/>