summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-19 02:46:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-19 02:46:56 +0000
commitf4fb9ba68de2c20dd4fe3e84c243c9101ce5c263 (patch)
tree591cdf253b3a7e97e76404bd367a340479a6e79e
parentac50fbf42243c52962cf129f4ff5ba60c920a2b1 (diff)
downloaddrakx-backup-do-not-use-f4fb9ba68de2c20dd4fe3e84c243c9101ce5c263.tar
drakx-backup-do-not-use-f4fb9ba68de2c20dd4fe3e84c243c9101ce5c263.tar.gz
drakx-backup-do-not-use-f4fb9ba68de2c20dd4fe3e84c243c9101ce5c263.tar.bz2
drakx-backup-do-not-use-f4fb9ba68de2c20dd4fe3e84c243c9101ce5c263.tar.xz
drakx-backup-do-not-use-f4fb9ba68de2c20dd4fe3e84c243c9101ce5c263.zip
fix keyboarddrake not modifying xkb
-rw-r--r--perl-install/Xconfig/xfree.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm
index 976ee48d2..680189915 100644
--- a/perl-install/Xconfig/xfree.pm
+++ b/perl-install/Xconfig/xfree.pm
@@ -52,12 +52,12 @@ sub empty_config {
my @keyboard_fields = qw(XkbLayout XkbModel XkbDisable XkbOptions XkbCompat);
sub get_keyboard {
my ($raw_X) = @_;
- my $raw_kbd = $raw_X->get_InputDevices('Keyboard') or die "no keyboard section";
+ my $raw_kbd = first($raw_X->get_InputDevices('Keyboard')) or die "no keyboard section";
raw_export_section($raw_kbd, \@keyboard_fields);
}
sub set_keyboard {
my ($raw_X, $kbd) = @_;
- my $raw_kbd = $raw_X->get_InputDevices('Keyboard') || _new_keyboard_section($raw_X);
+ my $raw_kbd = first($raw_X->get_InputDevices('Keyboard')) || _new_keyboard_section($raw_X);
raw_import_section($raw_kbd, $kbd);
_set_Option('keyboard', $raw_kbd, keys %$kbd);
}