diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-04 02:15:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-04 02:15:15 +0000 |
| commit | 6be7d3cdfb70e86cf22f837e40b85015bdbc3654 (patch) | |
| tree | f7de14da6a15dc04027dcf74e4cd440ea4d7878a | |
| parent | 87bcf74b039effce95dc2bf8152a48d49ca6bb1e (diff) | |
| download | drakx-backup-do-not-use-6be7d3cdfb70e86cf22f837e40b85015bdbc3654.tar drakx-backup-do-not-use-6be7d3cdfb70e86cf22f837e40b85015bdbc3654.tar.gz drakx-backup-do-not-use-6be7d3cdfb70e86cf22f837e40b85015bdbc3654.tar.bz2 drakx-backup-do-not-use-6be7d3cdfb70e86cf22f837e40b85015bdbc3654.tar.xz drakx-backup-do-not-use-6be7d3cdfb70e86cf22f837e40b85015bdbc3654.zip | |
(write) if one override default IM, remove any setting from default IM (hint:
some IM configurations do not have all fields set...)
| -rw-r--r-- | perl-install/lang.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 91d3bf4b1..b916d5ccc 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -1023,8 +1023,12 @@ sub write { } } - add2hash($h, $gtkqt_im{$locale->{IM}}); - add2hash($h, $xim{$h->{LANG}}); + my %conf = %{$xim{$h->{LANG}}} if $xim{$h->{LANG}}; + if ($locale->{IM}) { + delete @{$_}{qw(GTK_IM_MODULE XIM XIM_PROGRAM XMODIFIERS)} foreach $h, \%conf; + add2hash($h, $gtkqt_im{$locale->{IM}}); + } + add2hash($h, \%conf); #- deactivate translations on console for RTL languages if ($h->{LANG} =~ /ar|fa|he|ur|yi/) { |