diff options
Diffstat (limited to 'perl-install/install_gtk.pm')
| -rw-r--r-- | perl-install/install_gtk.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index c7086f915..85b3e51ce 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -109,8 +109,7 @@ widget "*" style "default-font" sub default_theme { my ($o) = @_; $::move ? '/usr/share/themes/Galaxy/gtk-2.0/gtkrc' : - $o->{meta_class} eq 'firewall' ? 'mdk-Firewall' : - $o->{simple_themes} || $o->{vga16} ? 'blue' : 'galaxy'; + $o->{simple_themes} || $o->{vga16} ? 'blue' : $::corporate ? 'corporate' : 'galaxy'; } sub install_theme { @@ -256,8 +255,7 @@ sub createXconf { symlink("/tmp/stage2/etc/X11", "/etc/X11"); if ($Driver) { - output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); - + output($file, sprintf(<<'END', ($::globetrotter ? "" : 'Option "XkbDisable"'), $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); Section "Files" FontPath "/usr/X11R6/lib/X11/fonts:unscaled" EndSection @@ -265,7 +263,7 @@ EndSection Section "InputDevice" Identifier "Keyboard" Driver "Keyboard" - Option "XkbDisable" + %s Option "XkbModel" "pc105" Option "XkbLayout" "" EndSection |