Author: mvidner Date: Thu May 27 15:24:03 2010 New Revision: 62074 URL: http://svn.opensuse.org/viewcvs/yast?rev=62074&view=rev Log: Fixed handling of return symbols (buggy patch for bnc#589541, now bnc#608166) (thx, bubli) Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-client.changes?rev=62074&r1=62073&r2=62074&view=diff ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu May 27 15:24:03 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 26 16:58:39 CEST 2010 - kmachalkova@suse.cz + +- Fixed handling of return symbols (buggy patch for bnc#589541, now + bnc#608166) + +------------------------------------------------------------------- Mon Mar 22 15:22:12 CET 2010 - juhliarik@suse.cz - added fix for problem with OK button (bnc#589541) Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=62074&r1=62073&r2=62074&view=diff ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu May 27 15:24:03 2010 @@ -180,7 +180,7 @@ } /** * Ask user for an entry. - * @param fstab_ent $["spec": "file": "mntopts":] or nil + * @param fstab_ent $["spec": "file": "mntops":] or nil * @param existing list of fstab entries for duplicate mount-point checking * @return a nfs_entry or nil */ @@ -701,7 +701,11 @@ { event = UI::WaitForEvent (); ret = event["ID"]:nil; - if (ret == `cancel) + if (ret == `ok) + { + ret = `next; + } + else if (ret == `cancel) { ret = `abort; } @@ -712,9 +716,9 @@ else HandleEvent( ret ); } - while (ret != `back && ret != `next && ret != `abort && ret != `ok); + while (ret != `back && ret != `next && ret != `abort); - if (ret == `next || ret == `ok) + if (ret == `next) { // grab current settings, store them to SuSEFirewall:: if( UI::WidgetExists(`id(`fstable)) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org