summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-12-10 16:26:14 +0000
committerThierry Vignaud <tv@mandriva.org>2009-12-10 16:26:14 +0000
commit46fdc2d7e9fc9590504075de875c91ff9603a71c (patch)
treec9c30d114495f99deafd44a74e80d3184ea926b5
parent080924207334f49e63c32e04546d8c4aa96413ad (diff)
downloaddrakx-backup-do-not-use-46fdc2d7e9fc9590504075de875c91ff9603a71c.tar
drakx-backup-do-not-use-46fdc2d7e9fc9590504075de875c91ff9603a71c.tar.gz
drakx-backup-do-not-use-46fdc2d7e9fc9590504075de875c91ff9603a71c.tar.bz2
drakx-backup-do-not-use-46fdc2d7e9fc9590504075de875c91ff9603a71c.tar.xz
drakx-backup-do-not-use-46fdc2d7e9fc9590504075de875c91ff9603a71c.zip
fix configuring ibus for KDE4 (#56311)
(backported from trunk)
-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 7dad4a334..73965a0d7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -13,7 +13,7 @@ Version 12.77.1 - 18 November 2009
o hide Gtk+ "close" button when displaying first time wizard that
now has a HTML "close" button again
- localedrake
- o fix configuring ibus (#56130)
+ o fix configuring ibus (#56130, #56311)
o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
- partitioning wizard:
o only display Help button in install
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 34b3f123b..633eb6b5f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,6 @@
- do not offer to upgrade/install in restore mode
- locale settings
- o fix configuring ibus (#56130)
+ o fix configuring ibus (#56130, #56311)
o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
Version 12.77 - 30 October 2009
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index a60ece802..750bcef5e 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -674,7 +674,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 => {