From b0ead5928c5b9edde049f99387de745f7d06ce7a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 3 May 2004 17:34:59 +0000
Subject: XFree 3 is gone!

---
 perl-install/Xconfig/screen.pm | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'perl-install/Xconfig/screen.pm')

diff --git a/perl-install/Xconfig/screen.pm b/perl-install/Xconfig/screen.pm
index 761c5defd..89e416a4d 100644
--- a/perl-install/Xconfig/screen.pm
+++ b/perl-install/Xconfig/screen.pm
@@ -7,7 +7,7 @@ use common;
 
 
 sub configure {
-    my ($raw_X, $card) = @_;
+    my ($raw_X) = @_;
 
     my @devices = $raw_X->get_devices;
     my @monitors = $raw_X->get_monitors;
@@ -17,25 +17,12 @@ sub configure {
 	@monitors = $raw_X->get_monitors;
     }
 
-    if ($card->{server}) {
-	$raw_X->{xfree3}->set_screens({ Device => $devices[0]{Identifier}, Monitor => $monitors[0]{Identifier},
-					Driver => $Xconfig::card::serversdriver{$card->{server}} || internal_error("bad XFree3 server $card->{server}"),
-				      });
-    } else {
-	@{$raw_X->{xfree3}} = ();
-    }
-
-    if ($card->{Driver}) {
-	my @sections = mapn {
-	    my ($device, $monitor) = @_;
-	    { Device => $device->{Identifier}, Monitor => $monitor->{Identifier} }
-	} \@devices, \@monitors;
-
-	$raw_X->{xfree4}->set_screens(@sections);
-    } else {
-	@{$raw_X->{xfree4}} = ();
-    }
+    my @sections = mapn {
+	my ($device, $monitor) = @_;
+	{ Device => $device->{Identifier}, Monitor => $monitor->{Identifier} }
+    } \@devices, \@monitors;
 
+    $raw_X->set_screens(@sections);
     1;
 }
 
-- 
cgit v1.2.1