Merge lp:~evfool/synaptic/lp975578 into lp:synaptic

[Robert Roth]

Do not show Successfully marked all available updates status text in case the user cancels the operation on the summary dialog. (LP: #975578)

[Daniel Hartwig (wigs)]

On cancel, the status will be set to:
 Failed to mark all available upgrades!

which is not correct.

This should rather not-set/clear the status message, as per cancelling other operations (see gtk/rgmainwindow.cc:2905, for example), or at least change to mention “cancelled”. Below is a patch for this. Note that the final call to showErrors is a noop on cancel, since askStateChange will discard pending errors if the user cancels.

=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc 2012-07-12 20:03:08 +0000
+++ gtk/rgmainwindow.cc 2012-11-13 01:58:53 +0000
@@ -3247,10 +3247,12 @@
    else
       res = me->_lister->upgrade();

- me->askStateChange(state);
+ bool changed = me->askStateChange(state);
    me->refreshTable(pkg);

- if (res)
+ if (!changed)
+ me->setStatusText();
+ else if (res)
       me->setStatusText(_("Successfully marked available upgrades"));
    else
       me->setStatusText(_("Failed to mark all available upgrades!"));

review: Needs Fixing

[Daniel Hartwig (wigs)]

Formatting for the above patch (i.e. whitespace) not preserved by the comment system, but you get the idea.

[Daniel Hartwig (wigs)]

… and I see that mvo already fixed this in the merge, never mind then :-)

[Michael Vogt (mvo)]

On Tue, Nov 13, 2012 at 02:23:42AM -0000, Daniel Hartwig wrote:
> … and I see that mvo already fixed this in the merge, never mind then :-)

Thanks Robert for your fix! I merged it with the small tweak that
Daniel pointed out, i.e. not show a error if the user cancels.

@Daniel: I do like your approach using the "bool changed = " as it
makes more explicit what actually happend.

Cheers,
 Michael

=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2012-07-12 20:03:08 +0000
+++ gtk/rgmainwindow.cc	2012-11-12 14:37:23 +0000
@@ -3247,7 +3247,7 @@
    else
       res = me->_lister->upgrade();
 
-   me->askStateChange(state);
+   res = res & me->askStateChange(state);
    me->refreshTable(pkg);
 
    if (res)