summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-03-03 14:09:06 +0000
committerOlivier Blin <oblin@mandriva.com>2009-03-03 14:09:06 +0000
commit081951940b6743bbc093a04dbd5a68bddd7f91a7 (patch)
treeba550817fdfd242e2de5820b1a3db56fd63d77d9
parent37188a3cad116af66aacfc46bfa809987236e8fe (diff)
downloaddrakx-081951940b6743bbc093a04dbd5a68bddd7f91a7.tar
drakx-081951940b6743bbc093a04dbd5a68bddd7f91a7.tar.gz
drakx-081951940b6743bbc093a04dbd5a68bddd7f91a7.tar.bz2
drakx-081951940b6743bbc093a04dbd5a68bddd7f91a7.tar.xz
drakx-081951940b6743bbc093a04dbd5a68bddd7f91a7.zip
fix reading default input method setting (skim was read if scim-bridge was configured before)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/lang.pm12
2 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fe1886889..4cdf929d3 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- finish-install:
o finit support
o give console rights for current session when renaming user
+- localdrake/finish-install:
+ o fix reading default input method setting
Version 11.71.8 - 25 February 2009
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 8499ea6ec..e9ebe91da 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1080,13 +1080,11 @@ sub read {
my $locale = system_locales_to_ourlocale($h{LC_MESSAGES} || 'en_US', $h{LC_MONETARY} || 'en_US');
if (find { $h{$_} } @IM_i18n_fields) {
- my @l = grep { !/^scim/ || /\(default\)/ } keys %IM_config;
- foreach my $field ('XMODIFIERS', 'XIM_PROGRAM') {
- $h{$field} or next;
- my @m = grep { $h{$field} eq $IM_config{$_}{$field} } @l or last;
- @l = @m;
- }
- $locale->{IM} = $l[0] if @l;
+ my $current_IM = find {
+ my $i = $IM_config{$_};
+ every { !defined $i->{$_} || $h{$_} eq $i->{$_} } ('GTK_IM_MODULE', 'XMODIFIERS', 'XIM_PROGRAM');
+ } keys %IM_config;
+ $locale->{IM} = $current_IM if $current_IM;
}
$locale;
}