Author: jsuchome Date: Fri Dec 4 15:47:52 2009 New Revision: 59962 URL: http://svn.opensuse.org/viewcvs/yast?rev=59962&view=rev Log: - save baud rate, check for `ok dialog return value (bnc#558525) - 2.18.2 Modified: branches/SuSE-Linux-11_2-Branch/irda/VERSION branches/SuSE-Linux-11_2-Branch/irda/package/yast2-irda.changes branches/SuSE-Linux-11_2-Branch/irda/src/Irda.ycp branches/SuSE-Linux-11_2-Branch/irda/src/ui.ycp branches/SuSE-Linux-11_2-Branch/irda/testsuite/tests/Write.out Modified: branches/SuSE-Linux-11_2-Branch/irda/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/irda/VERSION?rev=59962&r1=59961&r2=59962&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/irda/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/irda/VERSION Fri Dec 4 15:47:52 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: branches/SuSE-Linux-11_2-Branch/irda/package/yast2-irda.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/irda/package/yast2-irda.changes?rev=59962&r1=59961&r2=59962&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/irda/package/yast2-irda.changes (original) +++ branches/SuSE-Linux-11_2-Branch/irda/package/yast2-irda.changes Fri Dec 4 15:47:52 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 30 10:04:56 CET 2009 - jsuchome@suse.cz + +- save baud rate, check for `ok dialog return value (bnc#558525) +- 2.18.2 + +------------------------------------------------------------------- Fri Sep 4 12:25:48 CEST 2009 - ug@suse.de - fixed typo in the desktop file which makes yast2-schema fail Modified: branches/SuSE-Linux-11_2-Branch/irda/src/Irda.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/irda/src/Irda.ycp?rev=59962&r1=59961&r2=59962&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/irda/src/Irda.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/irda/src/Irda.ycp Fri Dec 4 15:47:52 2009 @@ -107,8 +107,12 @@ if (port != "") { SCR::Write (.sysconfig.irda.IRDA_PORT, port); - SCR::Write (.sysconfig.irda, nil); } + if (max_baud_rate != nil) + { + SCR::Write (.sysconfig.irda.IRDA_MAX_BAUD_RATE, max_baud_rate); + } + SCR::Write (.sysconfig.irda, nil); Progress::NextStage (); Modified: branches/SuSE-Linux-11_2-Branch/irda/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/irda/src/ui.ycp?rev=59962&r1=59961&r2=59962&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/irda/src/ui.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/irda/src/ui.ycp Fri Dec 4 15:47:52 2009 @@ -25,9 +25,9 @@ * @param port the serial port use for IrDA * (to see if it was changed and service needs to be restarted) */ -define boolean TestPopup (string port) { +define boolean TestPopup (string port, string baud_rate) { - boolean modified = port != Irda::port; + boolean modified = port != Irda::port || baud_rate != Irda::max_baud_rate; // if service was originaly started boolean orig_start = false; @@ -44,15 +44,16 @@ { // 1. save new configuration SCR::Write (.sysconfig.irda.IRDA_PORT, port); + SCR::Write (.sysconfig.irda.IRDA_MAX_BAUD_RATE, baud_rate); SCR::Write (.sysconfig.irda, nil); } // 2. start/restart the service // when module cannot be loaded, Runlevel returns 0 -> use target.bash if (!orig_start) - out = (map) SCR::Execute (.target.bash_output, "rcirda start"); + out = Service::RunInitScriptOutput ("irda", "start"); else if (modified) - out = (map) SCR::Execute (.target.bash_output, "rcirda restart"); + out = Service::RunInitScriptOutput ("irda", "restart"); return out["stderr"]:""; } @@ -66,6 +67,7 @@ if (modified) { SCR::Write (.sysconfig.irda.IRDA_PORT, Irda::port); + SCR::Write (.sysconfig.irda.IRDA_MAX_BAUD_RATE, Irda::max_baud_rate); SCR::Write (.sysconfig.irda, nil); } @@ -308,12 +310,12 @@ } if (ret == `test) { - TestPopup (port); + TestPopup (port, baud_rate); } } while (!contains ([`back, `abort, `cancel, `next, `ok], ret)); - if (ret == `next && + if ((ret == `next || ret == `ok) && (start != Irda::start || port != Irda::port || baud_rate != Irda::max_baud_rate)) { @@ -336,7 +338,7 @@ Irda::Read (); symbol ret = IrDADialog (); - if (ret == `next || ret == `finish) + if (ret == `next || ret == `finish || ret == `ok) { Irda::Write (); } Modified: branches/SuSE-Linux-11_2-Branch/irda/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/irda/testsuite/tests/Write.out?rev=59962&r1=59961&r2=59962&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/irda/testsuite/tests/Write.out (original) +++ branches/SuSE-Linux-11_2-Branch/irda/testsuite/tests/Write.out Fri Dec 4 15:47:52 2009 @@ -1,6 +1,8 @@ Dump ==== nothing modified: ===================== Return true Dump ==== stop irda: ============================ +Write .sysconfig.irda.IRDA_MAX_BAUD_RATE "0" true +Write .sysconfig.irda nil true Read .init.scripts.exists "irda" true Execute .target.bash_output "/etc/init.d/irda stop" $["TERM":"raw"] $["exit":0] Read .init.scripts.exists "irda" true @@ -12,6 +14,7 @@ Return true Dump ==== start irda, create link: ============== Write .sysconfig.irda.IRDA_PORT "new_port" true +Write .sysconfig.irda.IRDA_MAX_BAUD_RATE "0" true Write .sysconfig.irda nil true Read .init.scripts.exists "irda" true Execute .target.bash_output "/etc/init.d/irda stop" $["TERM":"raw"] $["exit":0] -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org