summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-09-06 09:29:18 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-09-06 09:29:18 +0000
commit0e96c697422d2b1d7df3aed3cc2250be72abda92 (patch)
treebe3b302cdedab7e4bd7a015fd3e29dadd8eaf0a4
parent9171dde54ad3c0b4590a7bf730854c09dcc38d19 (diff)
downloaddrakx-backup-do-not-use-0e96c697422d2b1d7df3aed3cc2250be72abda92.tar
drakx-backup-do-not-use-0e96c697422d2b1d7df3aed3cc2250be72abda92.tar.gz
drakx-backup-do-not-use-0e96c697422d2b1d7df3aed3cc2250be72abda92.tar.bz2
drakx-backup-do-not-use-0e96c697422d2b1d7df3aed3cc2250be72abda92.tar.xz
drakx-backup-do-not-use-0e96c697422d2b1d7df3aed3cc2250be72abda92.zip
always set QT_IM_MODULE when setting GTK_IM_MODULE
-rw-r--r--perl-install/lang.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index d28fb2501..d63e59817 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -540,13 +540,11 @@ my %gtkqt_im =
scim => {
GTK_IM_MODULE => 'scim',
- QT_IM_MODULE => 'scim',
XIM_PROGRAM => 'scim -d',
XMODIFIERS => '@im=SCIM',
},
uim => {
GTK_IM_MODULE => 'uim-anthy',
- QT_IM_MODULE => 'uim-anthy',
XIM => 'uim-anthy',
XIM_PROGRAM => 'uim-xim',
XMODIFIERS => '@im=uim-anthy',
@@ -1022,8 +1020,9 @@ sub write {
}
if ($locale->{IM}) {
- delete @$h{qw(GTK_IM_MODULE XIM XIM_PROGRAM XMODIFIERS)};
+ delete @$h{qw(GTK_IM_MODULE QT_IM_MODULE XIM XIM_PROGRAM XMODIFIERS)};
add2hash($h, $gtkqt_im{$locale->{IM}});
+ $h->{QT_IM_MODULE} = $h->{GTK_IM_MODULE} if $h->{GTK_IM_MODULE};
my @packages = IM2packages($locale);
if (@packages && $b_user_only) {
require interactive;