Author: jsuchome Date: Wed Jan 14 11:02:26 2009 New Revision: 54605 URL: http://svn.opensuse.org/viewcvs/yast?rev=54605&view=rev Log: - no exit confirmation popup if no changes were made (bnc#458319) Modified: trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/ui.ycp Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-clie... ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Wed Jan 14 11:02:26 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 14 11:01:51 CET 2009 - jsuchome@suse.cz + +- no exit confirmation popup if no changes were made (bnc#458319) + +------------------------------------------------------------------- Thu Nov 13 16:33:43 CET 2008 - ug@suse.de - rnc file fixed Modified: trunk/nis-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/ui.ycp?rev=54605&a... ============================================================================== --- trunk/nis-client/src/ui.ycp (original) +++ trunk/nis-client/src/ui.ycp Wed Jan 14 11:02:26 2009 @@ -63,10 +63,9 @@ */ define boolean ReallyAbort (boolean touched) ``{ - return - (!Stage::cont () || contains (WFM::Args (), "from_users")) - ? Popup::ReallyAbort (touched) - : Popup::ConfirmAbort (`incomplete); + if (Stage::cont () && !contains (WFM::Args (), "from_users")) + return Popup::ConfirmAbort (`incomplete); + return touched ? Popup::ReallyAbort (true) : true; } /** @@ -502,9 +501,9 @@ firewall_widget,"",event); } } - until (result == `back || result == `next || result == `expert || - result == `edit || - (result == `abort && ReallyAbort (Nis::touched))); + until (result == `edit || result == `next || result == `expert || + (result == `abort && ReallyAbort (Nis::touched)) || + (result == `back && (Stage::cont () || ReallyAbort (Nis::touched)))); if (contains ([`next, `expert, `edit], result)) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org