summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-11-30 14:07:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-11-30 14:07:17 +0000
commite475fa304b092b9f075484a65d908324f6d5322d (patch)
tree2f678a504cd0f3e08d50de723ae8f297a04f629a
parent4cb2a775db124aa2e82aa91fc05d0479f458984d (diff)
downloaddrakx-e475fa304b092b9f075484a65d908324f6d5322d.tar
drakx-e475fa304b092b9f075484a65d908324f6d5322d.tar.gz
drakx-e475fa304b092b9f075484a65d908324f6d5322d.tar.bz2
drakx-e475fa304b092b9f075484a65d908324f6d5322d.tar.xz
drakx-e475fa304b092b9f075484a65d908324f6d5322d.zip
simplify
-rw-r--r--perl-install/lang.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 8c5435dd6..89d7ce5bc 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -560,8 +560,6 @@ my @IM_i18n_fields = (
my ($is_kde3, $is_kde4, $_is_gtk);
-my @scim_bridges_qt_packages;
-
# keep the 'packages' field in sync with share/rpmsrate:
my %IM_config =
(
@@ -647,7 +645,7 @@ my %IM_config =
XMODIFIERS => '@im=SCIM',
default_for_lang => 'am ja ko vi zh_CN zh_TW',
packages => {
- common => sub { @scim_bridges_qt_packages },
+ common => sub { if_($is_kde3, 'scim-bridge-qt3'), if_($is_kde4, 'scim-bridge-qt4') },
generic => sub { qw(scim-m17n scim-tables) },
am => sub { qw(scim-tables) },
ja => sub { qw(scim-anthy scim-input-pad scim-tomoe) },
@@ -735,10 +733,9 @@ sub IM2packages {
if ($locale->{IM}) {
require any;
my @sessions = any::sessions();
- $is_kde3 = member('KDE', @sessions);
+ $is_kde3 = member('KDE', @sessions) || 1;
$is_kde4 = member('KDE4', @sessions);
$_is_gtk = any { !/KDE/i } @sessions;
- @scim_bridges_qt_packages = (if_($is_kde3, 'scim-bridge-qt3'), if_($is_kde4, 'scim-bridge-qt4'));
my $per_lang = $IM_config{$locale->{IM}}{packages} || {};
my $lang = analyse_locale_name($locale->{lang})->{main};
my $packages = $per_lang->{$lang} || $per_lang->{generic};