Merge lp:~mitya57/indicator-session/lp1363630_trusty into lp:indicator-session/14.04

[Dmitry Shachnev]

Make Cancel button in Zenity backend work again.

I want to backport a fix for bug 1363630 to Trusty, as that bug keeps collecting duplicates.

--- Copy-paste from previous description ---
Currently the code in zenity_question() looks like:

if (!g_spawn_check_exit_status (exit_status, &error))
      confirmed = TRUE;
else
      confirmed = exit_status == 0;

However !g_spawn_check_exit_status() call is mostly equivalent to "exit_status != 0". Thus, confirmed will be *always* set to TRUE, even if the user cancelled the dialog.

This MP makes things work again.

[Charles Kerr (charlesk)]

LGTM; as Dmitry points out this is the same as his fix which was used in trunk @ bazaar.launchpad.net/~indicator-applet-developers/indicator-session/trunk.15.04/revision/455

review: Approve

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2014-06-18 20:34:50 +0000
+++ src/backend-dbus/actions.c	2015-03-18 11:45:55 +0000
@@ -705,13 +705,9 @@
     {
       confirmed = TRUE;
     }
-  else if (!g_spawn_check_exit_status (exit_status, &error))
-    {
-      confirmed = TRUE;
-    }
   else
     {
-      confirmed = exit_status == 0;
+      confirmed = g_spawn_check_exit_status (exit_status, &error);
     }
 
   log_and_clear_error (&error, G_STRLOC, G_STRFUNC);