On 20/09/2016 11:14, Michael Biebl wrote:
Am 20.09.2016 um 11:12 schrieb Landry MINOZA:
Tried to write a little patch (submitted upstream against master and
attached), but hard to rebuild all things to test it here.

Are you or any other following this bug able to test it?
Rebuilding the package should be simple:
apt-get build-dep mutter
apt-get source mutter
<apply patch>
dpkg-buildpackage -b
Thank you, was able to build a version with the last upstream version of the patch (attached) which seams in good way to be accepted in next version.

It passed all the test cases indicated in the initial report:
 - click on "Force Quit" kill the app.
 - press [ENTER] key kill the app.
 - click on "Wait" only close the dialog.
 - click on "X" (close button)  only close the dialog.
 - press [ESC] key only close the dialog.


Will you apply it or wait a new upstream version?

regards.
--

*Landry MINOZA*
MGI Sud-Ouest/
Chef de projet technique Linux et réseaux/
E-mail : lmin...@mgi.fr <mailto:lmin...@mgi.fr>

        

Tél :01 45 44 54 10

MGI France :11 rue de Téhéran - 75008 Paris | RCS: Paris B 382 770 584 |www.mgi.fr <http://www.mgi.fr> MGI SO :281 route d'Espagne - 31100 Toulouse | RCS: Toulouse B 421 125 816 |www.mgi.fr <http://www.mgi.fr> MGI Suisse :5 avenue de Rothorn - CH3960 Sierre | TVA 517-269 |www.mgiconsultants.ch <http://www.mgiconsultants.ch>

diff -rNubB mutter-3.22.0.orig/debian/patches/02_delete-swap-wait-force-quit-actions.patch mutter-3.22.0/debian/patches/02_delete-swap-wait-force-quit-actions.patch
--- mutter-3.22.0.orig/debian/patches/02_delete-swap-wait-force-quit-actions.patch	1970-01-01 01:00:00.000000000 +0100
+++ mutter-3.22.0/debian/patches/02_delete-swap-wait-force-quit-actions.patch	2016-09-20 16:25:38.788324596 +0200
@@ -0,0 +1,21 @@
+--- 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);
diff -rNubB mutter-3.22.0.orig/debian/patches/series mutter-3.22.0/debian/patches/series
--- mutter-3.22.0.orig/debian/patches/series	2016-09-20 16:23:34.965338460 +0200
+++ mutter-3.22.0/debian/patches/series	2016-09-20 16:26:07.468089735 +0200
@@ -1 +1,2 @@
 01_Wcast-align.patch
+02_delete-swap-wait-force-quit-actions.patch

Reply via email to