Author: mcalmer Date: Tue May 13 17:59:13 2008 New Revision: 47500 URL: http://svn.opensuse.org/viewcvs/yast?rev=47500&view=rev Log: map cancel symbol to abort (fix bnc#179781) Modified: trunk/ca-management/src/new_cert.ycp trunk/ca-management/src/new_cert_advanced.ycp trunk/ca-management/src/startup.ycp trunk/ca-management/src/wizards.ycp Modified: trunk/ca-management/src/new_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert.ycp?rev=47500&r1=47499&r2=47500&view=diff ============================================================================== --- trunk/ca-management/src/new_cert.ycp (original) +++ trunk/ca-management/src/new_cert.ycp Tue May 13 17:59:13 2008 @@ -330,6 +330,10 @@ } } } + if(ui == `cancel) + { + ui = `abort; + } } until (contains ([`back, `again, `next, `abort], ui)); @@ -442,8 +446,13 @@ } } } + if(ui == `cancel) + { + ui = `abort; + } + } - until (contains ([`back, `next, `abort, `advancedOptions ], ui)); + until (contains ([`back, `next, `abort, `advancedOptions, ], ui)); return ui; } @@ -960,6 +969,11 @@ ui = `again; } } + if(ui == `cancel) + { + ui = `abort; + } + } until (contains ([`back, `next, `abort], ui)); Modified: trunk/ca-management/src/new_cert_advanced.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_advanced.ycp?rev=47500&r1=47499&r2=47500&view=diff ============================================================================== --- trunk/ca-management/src/new_cert_advanced.ycp (original) +++ trunk/ca-management/src/new_cert_advanced.ycp Tue May 13 17:59:13 2008 @@ -118,6 +118,11 @@ { ret = (symbol) UI::UserInput (); + if(ret == `cancel) + { + ret = `abort; + } + // "Default" button if (ret == `default) { Modified: trunk/ca-management/src/startup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/startup.ycp?rev=47500&r1=47499&r2=47500&view=diff ============================================================================== --- trunk/ca-management/src/startup.ycp (original) +++ trunk/ca-management/src/startup.ycp Tue May 13 17:59:13 2008 @@ -180,7 +180,7 @@ importCAFromDisk(); } } - until (contains ([`createRoot, `enter, `next, `import, `delete], ui)); + until (contains ([`createRoot, `enter, `next, `import, `delete, `cancel], ui)); return ui; } Modified: trunk/ca-management/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/wizards.ycp?rev=47500&r1=47499&r2=47500&view=diff ============================================================================== --- trunk/ca-management/src/wizards.ycp (original) +++ trunk/ca-management/src/wizards.ycp Tue May 13 17:59:13 2008 @@ -72,7 +72,7 @@ `delete : "startup" ], "new_certCA" : $[ - `next : "startup", + `next : "startup", `abort : "startup", ], "ca_main" : $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org