Browse files

- fixed saving of empty PIN to the config file, allow alphanumeric

  chars in PIN if they are already present (#297804)
- 2.15.4

svn path=/trunk/bluetooth/; revision=40670
  • Loading branch information...
1 parent 4051cda commit 0970d07cc8d6435d9d4e97f6ff95e8ec34549737 @lslezak lslezak committed Sep 3, 2007
Showing with 17 additions and 7 deletions.
  1. +1 −1 VERSION
  2. +7 −0 package/yast2-bluetooth.changes
  3. +4 −4 src/Bluetooth.ycp
  4. +5 −2 src/dialogs.ycp
View
2 VERSION
@@ -1 +1 @@
-2.15.3
+2.15.4
View
7 package/yast2-bluetooth.changes
@@ -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
View
8 src/Bluetooth.ycp
@@ -318,23 +318,23 @@ global boolean Write() {
// 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 + "\"";
}
SCR::Write(.bluetooth.hcid.value.device.name, [device_name_save]);
// 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 + "\"";
}
View
7 src/dialogs.ycp
@@ -116,8 +116,11 @@ symbol GlobalOptionsDialog () {
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();

0 comments on commit 0970d07

Please sign in to comment.