From bda0cae3fedc4a4b2368f0647f392bffec327af0 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 21 Nov 2008 17:08:19 +0000
Subject: move things (prepare next commit)

---
 lib/Xconfig/monitor.pm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'lib/Xconfig/monitor.pm')

diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index 0c49360..b388397 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -97,20 +97,19 @@ sub choose {
 	push @l_monitors, $s;
 	$h_monitors{$s} = $_;
     }
+    $h_monitors{"Plug'n Play"} = {};
 
   ask_monitor:
+    my $merge_name = sub {
+	my ($monitor) = @_;
+	$monitor->{ModelName} ? $monitor->{VendorName} . '|' . $monitor->{ModelName} : $monitor->{VendorName};
+    };
     my $merged_name = do {
-	if ($monitor->{VendorName} eq "Plug'n Play") {
-	    $monitor->{VendorName};
-	} else {
-	    my $merged_name = $monitor->{VendorName} . '|' . $monitor->{ModelName};
-
-	    if (!exists $h_monitors{$merged_name}) {
-		$merged_name = is_valid($monitor) ? 'Custom' : good_default_monitor();
-	    } else {
-		$merged_name;
-	    }
+	my $merged_name = $merge_name->($monitor);
+	if (!exists $h_monitors{$merged_name}) {
+	    $merged_name = is_valid($monitor) ? 'Custom' : good_default_monitor();
 	}
+	$merged_name;
     };
 
     $in->ask_from_({ title => N("_: This is a display device\nMonitor"),
-- 
cgit v1.2.1