Session Menu

Merge lp://staging/~mitya57/indicator-session/lp1363630 into lp://staging/indicator-session/14.10

lp1363630
Merge into trunk.14.10

Proposed by Dmitry Shachnev on 2014-08-31

Status:

Merged

Approved by:

Charles Kerr on 2014-09-08

Approved revision:

455

Merged at revision:

455

Proposed branch:

lp://staging/~mitya57/indicator-session/lp1363630

Merge into:

lp://staging/indicator-session/14.10

Diff against target:

18 lines (+1/-5)

1 file modified

src/backend-dbus/actions.c (+1/-5)

To merge this branch:

bzr merge lp://staging/~mitya57/indicator-session/lp1363630

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Charles Kerr (community)	2014-08-31	Approve on 2014-09-08
Ted Gould	2014-09-05	Pending
Indicator Applet Developers	2014-08-31	Pending
Review via email: mp+232813@code.staging.launchpad.net

Commit message

Make Cancel button in Zenity backend work again

Description of the change

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.

Revision history for this message