From bb895bbaadb5b4e5132bfb28b5f4ee68eae812cd Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 22 Mar 2005 16:23:18 +0000
Subject: put X conf read in Xconfig::main

---
 perl-install/Xconfig/main.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'perl-install/Xconfig')

diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index eb0d1d22b..3b1189e79 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -14,8 +14,9 @@ use any;
 
 
 sub configure_monitor {
-    my ($in, $raw_X) = @_;
+    my ($in) = @_;
 
+    my $raw_X = Xconfig::xfree->read;
     my $before = $raw_X->prepare_write;
     Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices)) or return;
     if ($raw_X->prepare_write ne $before) {
@@ -27,8 +28,9 @@ sub configure_monitor {
 }
 
 sub configure_resolution {
-    my ($in, $raw_X) = @_;
+    my ($in) = @_;
 
+    my $raw_X = Xconfig::xfree->read;
     my $X = { 
 	card => Xconfig::card::from_raw_X($raw_X),
 	monitors => [ $raw_X->get_monitors ],
-- 
cgit v1.2.1