From 3202cc94adcd9df067faf39cb27635409e56bc11 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 29 Dec 2002 12:19:34 +0000
Subject: move any::keyboard_group_toggle_choose() to
 keyboard::group_toggle_choose()

---
 perl-install/any.pm                       | 17 -----------------
 perl-install/install_steps_interactive.pm |  2 +-
 perl-install/keyboard.pm                  | 17 +++++++++++++++++
 perl-install/standalone/keyboarddrake     |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index ab492be35..1e62915a2 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -905,21 +905,4 @@ sub config_mtools {
     } $file;
 }
 
-sub keyboard_group_toggle_choose {
-    my ($in, $keyboard) = @_;
-
-    if (my $grp_toggles = keyboard::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
-(eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], $GRP_TOGGLE) or return;
-
-        log::l("GRP_TOGGLE: $GRP_TOGGLE");
-        $keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
-    } else {
-        $keyboard->{GRP_TOGGLE} = '';
-    }
-    1;
-}
-
 1;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d57fa421a..11eeed5f7 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -119,7 +119,7 @@ sub selectKeyboard {
 	$o->{keyboard}{KEYBOARD} = $other ? $ext_keyboard : $KEYBOARD;
 	delete $o->{keyboard}{unsafe};
     }
-    any::keyboard_group_toggle_choose($o, $o->{keyboard}) or goto &selectKeyboard;
+    keyboard::group_toggle_choose($o, $o->{keyboard}) or goto &selectKeyboard;
     install_steps::selectKeyboard($o);
 }
 
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 74dc03cce..901049f00 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -301,6 +301,23 @@ sub grp_toggles {
     \%grp_toggles;
 }
 
+sub group_toggle_choose {
+    my ($in, $keyboard) = @_;
+
+    if (my $grp_toggles = keyboard::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
+(eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], $GRP_TOGGLE) or return;
+
+        log::l("GRP_TOGGLE: $GRP_TOGGLE");
+        $keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
+    } else {
+        $keyboard->{GRP_TOGGLE} = '';
+    }
+    1;
+}
+
 sub loadkeys_files {
     my ($err) = @_;
     my $archkbd = arch() =~ /^sparc/ ? "sun" : arch() =~ /i.86/ ? "i386" : arch() =~ /ppc/ ? "mac" : arch();
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 7e594f17b..471b6e219 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -28,7 +28,7 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
 						[ keyboard::KEYBOARDs() ],
 						$keyboard->{KEYBOARD}) or goto end;
 
-    any::keyboard_group_toggle_choose($in, $keyboard) or goto choose;
+    keyboard::group_toggle_choose($in, $keyboard) or goto choose;
 }
 
 if ($::expert) {
-- 
cgit v1.2.1