summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-12-10 16:26:10 +0000
committerThierry Vignaud <tv@mandriva.org>2009-12-10 16:26:10 +0000
commitc82ffcb52f1b754355a0111f822112f0fe2d8d86 (patch)
tree39aeb40a9563c9dcfe90fe9f4e63508e13d4d10a
parentafee874c6aedc31231371bc932126483da3a373c (diff)
downloaddrakx-backup-do-not-use-c82ffcb52f1b754355a0111f822112f0fe2d8d86.tar
drakx-backup-do-not-use-c82ffcb52f1b754355a0111f822112f0fe2d8d86.tar.gz
drakx-backup-do-not-use-c82ffcb52f1b754355a0111f822112f0fe2d8d86.tar.bz2
drakx-backup-do-not-use-c82ffcb52f1b754355a0111f822112f0fe2d8d86.tar.xz
drakx-backup-do-not-use-c82ffcb52f1b754355a0111f822112f0fe2d8d86.zip
fix configuring ibus (#56130) (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, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 63b85dd61..f50730652 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -12,6 +12,8 @@ Version 12.77.1 - 18 November 2009
o handle window.close() events (#55099)
o hide Gtk+ "close" button when displaying first time wizard that
now has a HTML "close" button again
+- localedrake
+ o fix configuring ibus (#56130)
- partitioning wizard:
o only display Help button in install
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3c5959119..44ee3e65d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
- do not offer to upgrade/install in restore mode
+- locale settings
+ o fix configuring ibus (#56130)
Version 12.77 - 30 October 2009
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 51979645a..0f3e5ccb4 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -675,7 +675,7 @@ my %IM_config =
'ibus' => {
GTK_IM_MODULE => 'ibus',
QT_IM_MODULE => 'xim',
- XIM_PROGRAM => 'ibus',
+ XIM_PROGRAM => 'ibus-daemon -d -x',
XMODIFIERS => '@im=ibus',
packages => {
generic => sub { qw(ibus-table ibus-m17n) },