From 6be7d3cdfb70e86cf22f837e40b85015bdbc3654 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Wed, 4 Aug 2004 02:15:15 +0000
Subject: (write) if one override default IM, remove any setting from default
 IM (hint: some IM configurations do not have all fields set...)

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

(limited to 'perl-install')

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/) {
-- 
cgit v1.2.1