summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-11-21 16:32:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-11-21 16:32:49 +0000
commit4cd02a401aab9086dcb451b11b842ce666e358d9 (patch)
tree58044330066cf62ce181d43b94bcf5639de6b6e7
parent57274b59069f698dd700e8ca7c4b9a60c1862ba2 (diff)
downloaddrakx-kbd-mouse-x11-4cd02a401aab9086dcb451b11b842ce666e358d9.tar
drakx-kbd-mouse-x11-4cd02a401aab9086dcb451b11b842ce666e358d9.tar.gz
drakx-kbd-mouse-x11-4cd02a401aab9086dcb451b11b842ce666e358d9.tar.bz2
drakx-kbd-mouse-x11-4cd02a401aab9086dcb451b11b842ce666e358d9.tar.xz
drakx-kbd-mouse-x11-4cd02a401aab9086dcb451b11b842ce666e358d9.zip
simplify
-rw-r--r--lib/Xconfig/monitor.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index ab2d5cb..c52e843 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -41,7 +41,7 @@ sub configure {
}
my $head_nb = 1;
foreach my $monitor (@$monitors) {
- choose($in, $monitor, @$monitors > 1 ? $head_nb++ : 0, $raw_X->get_Driver, $b_auto) or return;
+ choose($in, $monitor, @$monitors > 1 ? $head_nb++ : 0, $b_auto) or return;
}
$raw_X->set_monitors(@$monitors);
$monitors;
@@ -82,7 +82,7 @@ sub configure_auto_install {
}
sub choose {
- my ($in, $monitor, $head_nb, $card_Driver, $b_auto) = @_;
+ my ($in, $monitor, $head_nb, $b_auto) = @_;
my $ok = is_valid($monitor);
if ($b_auto && $ok) {
@@ -127,7 +127,7 @@ sub choose {
local $::noauto = 0; #- hey, you asked for plug'n play, so i do probe!
delete @$monitor{'VendorName', 'ModelName', 'EISA_ID', 'HorizSync', 'VertRefresh'};
if ($head_nb <= 1) {
- if (my $probed_info = probe($card_Driver)) {
+ if (my $probed_info = probe($raw_X->get_Driver)) {
put_in_hash($monitor, $probed_info);
} else {
log::l("Plug'n Play probing failed, but Xorg may do better");