diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/keyboard.pm | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,4 @@ +- suppress writing xorg.conf.d snippets for built in evdev defaults (mga#14476) - fix typo in xorg.conf.d snippet Version 1.5 - 9 February 2015 diff --git a/lib/keyboard.pm b/lib/keyboard.pm index b2c2af4..617dc39 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -627,10 +627,11 @@ sub write { "Section \"InputClass\"\n" . " Identifier \"system-keyboard\"\n" . " MatchIsKeyboard \"on\"\n"; - if ($keyboard->{'XkbLayout'}) { + my $isus = $keyboard->{'XkbLayout'} && $keyboard->{'XkbLayout'} eq "us"; + if ($keyboard->{'XkbLayout'} && !$isus) { $xorgconf .= " Option \"XkbLayout\" \"" . $keyboard->{'XkbLayout'} . "\"\n"; } - if ($keyboard->{'XkbModel'}) { + if ($keyboard->{'XkbModel'} && (!$isus || $keyboard->{'XkbModel'} ne "pc105")) { $xorgconf .= " Option \"XkbModel\" \"" . $keyboard->{'XkbModel'} . "\"\n"; } if ($keyboard->{'XkbVariant'}) { |