diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-09-15 18:31:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-09-15 18:31:16 +0000 |
| commit | ee1d6ad2b80b88e538d235ab445e9733c8bdb531 (patch) | |
| tree | d971169994156aac8d7d92218219d69d83cef64b | |
| parent | c46ae3cb4d0d6bbb9c199a6c308e9d30e6d3a6fa (diff) | |
| download | drakx-ee1d6ad2b80b88e538d235ab445e9733c8bdb531.tar drakx-ee1d6ad2b80b88e538d235ab445e9733c8bdb531.tar.gz drakx-ee1d6ad2b80b88e538d235ab445e9733c8bdb531.tar.bz2 drakx-ee1d6ad2b80b88e538d235ab445e9733c8bdb531.tar.xz drakx-ee1d6ad2b80b88e538d235ab445e9733c8bdb531.zip | |
kill extra SCIM combinations (simpler) (UTUMI Hirosi)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/lang.pm | 12 |
3 files changed, 3 insertions, 11 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 446c76f03..4882e9d9d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,6 +4,7 @@ o enable to select 'scim-bridge' as IM o install needed packages for skim o install scim-qtimm for scim default config + o remove extra SCIM combinations (simpler) Version 10.4.195 - 14 September 2007, by Thierry Vignaud diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index ef86aac23..c6f821d98 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -2,6 +2,7 @@ o enable to select 'scim-bridge' as IM o install needed packages for skim o install scim-qtimm for scim default config + o remove extra SCIM combinations (simpler) Version 10.4.196 - 14 September 2007, by Olivier "blino" Blin diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 2e4c2dd49..67404fb38 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -613,7 +613,7 @@ my %IM_config = XMODIFIERS => '@im=oxim', # '@im=SCIM' is broken for now packages => { generic => 'oxim' }, }, - 'scim+(default)' => { + 'scim' => { GTK_IM_MODULE => 'scim', QT_IM_MODULE => 'scim', XIM_PROGRAM => 'scim -d', @@ -629,16 +629,6 @@ my %IM_config = }, }, - (map { - ("scim+$_" => { - GTK_IM_MODULE => 'scim', - QT_IM_MODULE => 'scim', - XIM_PROGRAM => 'scim -d', - XMODIFIERS => '@im=SCIM', - packages => { generic => "scim-$_" }, - }); - } qw(anthy canna ccinput fcitx m17n prime pinyin skk uim)), # enable to select extra SCIM combinations - 'scim-bridge' => { GTK_IM_MODULE => 'scim-bridge', QT_IM_MODULE => 'scim-bridge', |