Author: lslezak Date: Mon Sep 3 08:15:15 2007 New Revision: 40670 URL: http://svn.opensuse.org/viewcvs/yast?rev=40670&view=rev Log: - fixed saving of empty PIN to the config file, allow alphanumeric chars in PIN if they are already present (#297804) - 2.15.4 Modified: trunk/bluetooth/VERSION trunk/bluetooth/package/yast2-bluetooth.changes trunk/bluetooth/src/Bluetooth.ycp trunk/bluetooth/src/dialogs.ycp Modified: trunk/bluetooth/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/VERSION?rev=40670&r1=40669&r2=40670&view=diff ============================================================================== --- trunk/bluetooth/VERSION (original) +++ trunk/bluetooth/VERSION Mon Sep 3 08:15:15 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/bluetooth/package/yast2-bluetooth.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/package/yast2-bluetooth.changes?rev=40670&r1=40669&r2=40670&view=diff ============================================================================== --- trunk/bluetooth/package/yast2-bluetooth.changes (original) +++ trunk/bluetooth/package/yast2-bluetooth.changes Mon Sep 3 08:15:15 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 08:11:57 CEST 2007 - lslezak@suse.cz + +- fixed saving of empty PIN to the config file, allow alphanumeric + chars in PIN if they are already present (#297804) +- 2.15.4 + +------------------------------------------------------------------- Fri Aug 24 13:07:18 CEST 2007 - lslezak@suse.cz - do not detect bluetooth devices when creating installation Modified: trunk/bluetooth/src/Bluetooth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/Bluetooth.ycp?rev=40670&r1=40669&r2=40670&view=diff ============================================================================== --- trunk/bluetooth/src/Bluetooth.ycp (original) +++ trunk/bluetooth/src/Bluetooth.ycp Mon Sep 3 08:15:15 2007 @@ -318,11 +318,11 @@ // save device name string device_name_save = device_name; - if (!regexpmatch(device_name_save, "^\"")) + if (!regexpmatch(device_name, "^\"")) { device_name_save = "\"" + device_name_save; } - if (!regexpmatch(device_name_save, "\"$")) + if (!regexpmatch(device_name, "\"$")) { device_name_save = device_name_save + "\""; } @@ -330,11 +330,11 @@ // the same for the PIN string pin_save = pin; - if (!regexpmatch(pin_save, "^\"")) + if (!regexpmatch(pin, "^\"")) { pin_save = "\"" + pin_save; } - if (!regexpmatch(pin_save, "\"$")) + if (!regexpmatch(pin, "\"$")) { pin_save = pin_save + "\""; } Modified: trunk/bluetooth/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/dialogs.ycp?rev=40670&r1=40669&r2=40670&view=diff ============================================================================== --- trunk/bluetooth/src/dialogs.ycp (original) +++ trunk/bluetooth/src/dialogs.ycp Mon Sep 3 08:15:15 2007 @@ -116,8 +116,11 @@ Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton()); - // allow only numbers in PIN widget - UI::ChangeWidget(`id(`pin), `ValidChars, "0132456789"); + if (regexpmatch(Bluetooth::pin, "^[0-9]*$")) + { + // allow only numbers in PIN widget + UI::ChangeWidget(`id(`pin), `ValidChars, "0132456789"); + } RefreshGlobalWidgets(); RefreshPINWidgets(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org