[mutter] delete: Swap wait/force-quit actions

[Florian Müllner <fmuellner src gnome org>]

commit ed52e1788668abe771653093e0f642f876ef5fbf
Author: Landry MINOZA <landry minoza gmail com>
Date:   Tue Sep 20 12:03:38 2016 +0200

    delete: Swap wait/force-quit actions
    
    The order doesn't only affect the visual layout, but also which action
    cancels the dialog (and therefore responds to Escape). It is completely
    surprising that this triggers a destructive action like force-quit, so
    swap the actions to wait when the dialog is cancelled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=737109

 src/core/delete.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/core/delete.c b/src/core/delete.c
index a6a0608..9d4d4f0 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -44,8 +44,8 @@ dialog_exited (GPid pid, int status, gpointer user_data)
 
   window->dialog_pid = -1;
 
-  /* exit status of 1 means the user pressed "Force Quit" */
-  if (WIFEXITED (status) && WEXITSTATUS (status) == 1)
+  /* exit status of 0 means the user pressed "Force Quit" */
+  if (WIFEXITED (status) && WEXITSTATUS (status) == 0)
     meta_window_kill (window);
 }
 
@@ -138,7 +138,7 @@ show_delete_dialog (MetaWindow *window,
     meta_show_dialog ("--question",
                       window_content, NULL,
                       window->screen->screen_name,
-                      _("_Wait"), _("_Force Quit"),
+                      _("_Force Quit"), _("_Wait"),
                       "face-sad-symbolic", window->xwindow,
                       NULL, NULL);