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
This commit is contained in:
Landry MINOZA 2016-09-20 12:03:38 +02:00 committed by Florian Müllner
parent f63bb024fa
commit ed52e17886

View File

@ -44,8 +44,8 @@ dialog_exited (GPid pid, int status, gpointer user_data)
window->dialog_pid = -1; window->dialog_pid = -1;
/* exit status of 1 means the user pressed "Force Quit" */ /* exit status of 0 means the user pressed "Force Quit" */
if (WIFEXITED (status) && WEXITSTATUS (status) == 1) if (WIFEXITED (status) && WEXITSTATUS (status) == 0)
meta_window_kill (window); meta_window_kill (window);
} }
@ -138,7 +138,7 @@ show_delete_dialog (MetaWindow *window,
meta_show_dialog ("--question", meta_show_dialog ("--question",
window_content, NULL, window_content, NULL,
window->screen->screen_name, window->screen->screen_name,
_("_Wait"), _("_Force Quit"), _("_Force Quit"), _("_Wait"),
"face-sad-symbolic", window->xwindow, "face-sad-symbolic", window->xwindow,
NULL, NULL); NULL, NULL);