From 0e96c697422d2b1d7df3aed3cc2250be72abda92 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 6 Sep 2004 09:29:18 +0000
Subject: always set QT_IM_MODULE when setting GTK_IM_MODULE

---
 perl-install/lang.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'perl-install')

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;
-- 
cgit v1.2.1