summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-10-16 15:02:22 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-10-16 15:02:22 +0000
commit750ae1cff2d0df07cb1cb9a00bf07996e4593689 (patch)
treef81ee0fad6098bfcaf719ac6d4989a430d0b3218 /perl-install
parentc3a2565e1ccc9f6899a41349abd4ff4503e2c01c (diff)
downloaddrakx-750ae1cff2d0df07cb1cb9a00bf07996e4593689.tar
drakx-750ae1cff2d0df07cb1cb9a00bf07996e4593689.tar.gz
drakx-750ae1cff2d0df07cb1cb9a00bf07996e4593689.tar.bz2
drakx-750ae1cff2d0df07cb1cb9a00bf07996e4593689.tar.xz
drakx-750ae1cff2d0df07cb1cb9a00bf07996e4593689.zip
merge in gc's fix from HEAD for anti-aliasing with xf4 server
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_gtk.pm6
-rw-r--r--perl-install/install_steps_gtk.pm2
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index b1cf13aeb..7bc3e725a 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -197,10 +197,12 @@ sub create_logo_window {
}
#------------------------------------------------------------------------------
-sub init_gtk() {
+sub init_gtk {
+ my ($o) = @_;
+
symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-2.0 pango fonts);
- if (!listlength(cat_('/proc/fb'))) {
+ if ($o->{vga16}) {
#- inactivate antialias in VGA16 because it makes fonts look worse
output('/tmp/fonts.conf',
q(<fontconfig>
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 07b654c16..2d165e267 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -121,7 +121,7 @@ sub new($$) {
}
OK:
$ENV{DISPLAY} = $wanted_DISPLAY;
- install_gtk::init_gtk();
+ install_gtk::init_gtk($o);
install_gtk::init_sizes();
install_gtk::install_theme($o);
install_gtk::create_logo_window($o);