summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-12-10 14:29:24 +0000
committerThierry Vignaud <tv@mandriva.org>2009-12-10 14:29:24 +0000
commit59a13e9559ec7aecf2c0c342b7d65fe116ef61a0 (patch)
treee2badae9933de35c44c79062c0109a5cd16b7f74 /perl-install
parent4a69902599b171e27e93cedd80d6496e0509d477 (diff)
downloaddrakx-59a13e9559ec7aecf2c0c342b7d65fe116ef61a0.tar
drakx-59a13e9559ec7aecf2c0c342b7d65fe116ef61a0.tar.gz
drakx-59a13e9559ec7aecf2c0c342b7d65fe116ef61a0.tar.bz2
drakx-59a13e9559ec7aecf2c0c342b7d65fe116ef61a0.tar.xz
drakx-59a13e9559ec7aecf2c0c342b7d65fe116ef61a0.zip
fix configuring ibus for KDE4 (#56311)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/lang.pm2
3 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 26d05c2ab..97013af20 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,7 +2,7 @@
o fix setting volume label instead of MBR's one for FAT fses (#52853)
- localedrake
o drop support for configuring KDE3
- o fix configuring ibus (#56130)
+ o fix configuring ibus (#56130, #56311)
o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
Version 13.0 - 1 December 2009
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ba19af620..a15f21320 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,7 +1,7 @@
- fix crash introduced by 'do not stay chdired in /mnt/var/cache/urpmi'
- locale setting
o drop support for configuring KDE3
- o fix configuring ibus (#56130)
+ o fix configuring ibus (#56130, #56311)
o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
- partitioning wizard:
o fix setting volume label instead of MBR's one for FAT fses (#52853)
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index be1b8784d..99ac2ca3b 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -673,7 +673,7 @@ my %IM_config =
},
'ibus' => {
GTK_IM_MODULE => 'ibus',
- QT_IM_MODULE => 'xim',
+ QT_IM_MODULE => 'ibus',
XIM_PROGRAM => 'ibus-daemon -d -x',
XMODIFIERS => '@im=ibus',
packages => {