Author: mzugec Date: Thu Mar 26 15:30:01 2009 New Revision: 56429 URL: http://svn.opensuse.org/viewcvs/yast?rev=56429&view=rev Log: show PopupAbort only when data modified (bnc#458324) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/complex.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=56429&r1=56428&r2=56429&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Mar 26 15:30:01 2009 @@ -1 +1 @@ -2.18.23 +2.18.24 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=56429&r1=56428&r2=56429&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Mar 26 15:30:01 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 15:22:22 CET 2009 - mzugec@suse.cz + +- show PopupAbort only when data modified (bnc#458324) +- 2.18.24 + +------------------------------------------------------------------- Thu Mar 26 10:49:19 CET 2009 - mzugec@suse.cz - don't allow to use networkmanager with bridged proposal (bnc#487419) Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=56429&r1=56428&r2=56429&view=diff ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Thu Mar 26 15:30:01 2009 @@ -452,8 +452,15 @@ Wizard::SetAbortButton(`abort, Label::CancelButton()); Wizard::HideBackButton(); - symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]); + symbol ret = nil; + while(true){ + ret = CWM::Run(w, $[]); + if (ret==`abort){ + if (LanItems::modified && !ReallyAbort()) continue; + return ret; + } return ret; + } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org