diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-09-09 07:58:01 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-09-09 07:58:01 +0000 |
| commit | 2118865b39577940a03f1a979351ad135551cc7b (patch) | |
| tree | 4a9f6e4058879d7d4c468d973b53d3fe9e98c8f7 /perl-install | |
| parent | 39ea47c4d6cd97d5ec2f46c2eedba6a19ec983e0 (diff) | |
| download | drakx-2118865b39577940a03f1a979351ad135551cc7b.tar drakx-2118865b39577940a03f1a979351ad135551cc7b.tar.gz drakx-2118865b39577940a03f1a979351ad135551cc7b.tar.bz2 drakx-2118865b39577940a03f1a979351ad135551cc7b.tar.xz drakx-2118865b39577940a03f1a979351ad135551cc7b.zip | |
(set_default_im) really just set default IM and nothing more
(write) fix XIM_PROGRAM setting
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/lang.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 0e51e7673..6ea66b370 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -620,8 +620,6 @@ sub get_default_im { sub set_default_im { my ($im, @langs) = @_; foreach (@langs) { - add2hash($xim{$_}, $gtkqt_im{$im}); - add2hash($xim{$_}, { XIM_PROGRAM => $im_xim_program{$im}{$_} }); $default_im{$_}{IM} = $im foreach $_, analyse_locale_name($_)->{main}; } } @@ -1026,6 +1024,9 @@ sub write { if ($locale->{IM} && $locale->{IM} ne 'None') { log::explanations(qq(Configuring "$locale->{IM}" IM)); delete @$h{qw(GTK_IM_MODULE QT_IM_MODULE XIM XIM_PROGRAM XMODIFIERS)}; + my $lang = $locale->{lang}; + add2hash($h, $xim{$lang}); + add2hash($h, { XIM_PROGRAM => $im_xim_program{$locale->{IM}}{$lang} }); add2hash($h, $gtkqt_im{$locale->{IM}}); $h->{QT_IM_MODULE} = $h->{GTK_IM_MODULE} if $h->{GTK_IM_MODULE}; my @packages = IM2packages($locale); |