From 1a634a81bc8078ffc6f00956c528331a47653a78 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 16 Jul 2018 08:16:07 +0200
Subject: [PATCH] Use expected dialog button ordering in Launch Application
 dialog.

This resolves #639.
---
 toolkit/mozapps/handling/content/dialog.xul | 5 +++++
 toolkit/mozapps/handling/jar.mn             | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/handling/content/dialog.xul b/toolkit/mozapps/handling/content/dialog.xul
index f73ce6d7f6..2e2dab4e45 100644
--- a/toolkit/mozapps/handling/content/dialog.xul
+++ b/toolkit/mozapps/handling/content/dialog.xul
@@ -45,8 +45,13 @@
   <description id="remember-text"/>
 
   <hbox class="dialog-button-box" pack="end">
+#ifdef XP_WIN
+    <button dlgtype="accept" label="&accept;" icon="open" class="dialog-button"/>
+    <button dlgtype="cancel" icon="cancel" class="dialog-button"/>
+#else
     <button dlgtype="cancel" icon="cancel" class="dialog-button"/>
     <button dlgtype="accept" label="&accept;" icon="open" class="dialog-button"/>
+#endif
   </hbox>
 
 </dialog>
diff --git a/toolkit/mozapps/handling/jar.mn b/toolkit/mozapps/handling/jar.mn
index d6225ecca3..8c338a0db8 100644
--- a/toolkit/mozapps/handling/jar.mn
+++ b/toolkit/mozapps/handling/jar.mn
@@ -6,5 +6,5 @@ toolkit.jar:
 % content mozapps %content/mozapps/
   content/mozapps/handling/handler.css                          (content/handler.css)
   content/mozapps/handling/handler.xml                          (content/handler.xml)
-  content/mozapps/handling/dialog.xul                           (content/dialog.xul)
+* content/mozapps/handling/dialog.xul                           (content/dialog.xul)
   content/mozapps/handling/dialog.js                            (content/dialog.js)