summaryrefslogtreecommitdiffstats
path: root/perl-install/keyboard.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-09 02:42:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-09 02:42:55 +0000
commit36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f (patch)
tree80f6a68469ffe3418e9c79339228f1358a94f258 /perl-install/keyboard.pm
parent590b7c13a157fbfd3899e3d67e5b740856c46fbb (diff)
downloaddrakx-36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f.tar
drakx-36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f.tar.gz
drakx-36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f.tar.bz2
drakx-36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f.tar.xz
drakx-36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f.zip
don't need prefixing with current package
Diffstat (limited to 'perl-install/keyboard.pm')
-rw-r--r--perl-install/keyboard.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 8b1cedcd4..81b3b371f 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -382,7 +382,7 @@ sub grp_toggles {
sub group_toggle_choose {
my ($in, $keyboard) = @_;
- if (my $grp_toggles = keyboard::grp_toggles($keyboard)) {
+ if (my $grp_toggles = grp_toggles($keyboard)) {
my $GRP_TOGGLE = $keyboard->{GRP_TOGGLE} || 'caps_toggle';
$GRP_TOGGLE = $in->ask_from_listf('', N("Here you can choose the key or key combination that will
allow switching between the different keyboard layouts
@@ -550,7 +550,7 @@ sub xmodmap_file {
sub setxkbmap {
my ($keyboard) = @_;
- my $xkb = keyboard::keyboard2full_xkb($keyboard) or return;
+ my $xkb = keyboard2full_xkb($keyboard) or return;
run_program::run('setxkbmap', '-option', '') if $xkb->{XkbOptions}; #- need re-initialised other toggles are cumulated
run_program::run('setxkbmap', $xkb->{XkbLayout}, '-model' => $xkb->{XkbModel}, '-option' => $xkb->{XkbOptions} || '', '-compat' => $xkb->{XkbCompat} || '');
}