summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-07 13:46:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-07 13:46:14 +0000
commitc6d13ec24a8c2f7eebf1db8af05330e755248f10 (patch)
tree0db27de0f02724812505c91c381d131469ba4e1e
parent4d7ed03fc7f8f38a985be5aca35960158f352ca7 (diff)
downloaddrakx-c6d13ec24a8c2f7eebf1db8af05330e755248f10.tar
drakx-c6d13ec24a8c2f7eebf1db8af05330e755248f10.tar.gz
drakx-c6d13ec24a8c2f7eebf1db8af05330e755248f10.tar.bz2
drakx-c6d13ec24a8c2f7eebf1db8af05330e755248f10.tar.xz
drakx-c6d13ec24a8c2f7eebf1db8af05330e755248f10.zip
(main): don't need isLaptop anymore, use detect_devices::hasPCMCIA
-rw-r--r--perl-install/Xconfigurator.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index b54a87688..78f9e69e8 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -2,7 +2,7 @@ package Xconfigurator; # $Id$
use diagnostics;
use strict;
-use vars qw($in $install $isLaptop @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $XF86firstchunk_text2 $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4);
+use vars qw($in $install @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $XF86firstchunk_text2 $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4);
use common qw(:common :file :functional :system);
use log;
@@ -543,7 +543,7 @@ sub autoDefaultDepth($$) {
}
sub autoDefaultResolution {
- return "1024x768" if $isLaptop;
+ return "1024x768" if detect_devices::hasPCMCIA;
my ($size) = @_;
$monitorSize2resolution[round($size || 14)] || #- assume a small monitor (size is in inch)
@@ -1046,7 +1046,7 @@ sub show_info {
#- Program entry point.
sub main {
my ($o, $allowFB);
- ($prefix, $o, $in, $allowFB, $isLaptop, $install) = @_;
+ ($prefix, $o, $in, $allowFB, $install) = @_;
$o ||= {};
XF86check_link('');