From bb82abd56cebbbc2ab1e989d61efba9142634032 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 20 Sep 2007 07:03:10 +0000
Subject: - fix regression in 0.24: remove bogus duplicates in monitors tree
 (#33778)

---
 NEWS                   | 2 ++
 lib/Xconfig/monitor.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 075820b..4b49e9d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix regression in 0.24: remove bogus duplicates in monitors tree (#33778)
+
 Version 0.27 - 19 September 2007, by Pascal "Pixel" Rigaux
 
 - for evdev configured mice, specify bustype
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index b5a05c3..6d1e851 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -116,7 +116,7 @@ sub choose {
 		     interactive_help_id => 'configureX_monitor' 
 		   },
 		  [ { val => \$merged_name, separator => '|', 
-		      list => ['Custom', "Plug'n Play", @l_monitors],
+		      list => ['Custom', "Plug'n Play", uniq(@l_monitors)],
 		      format => sub { $_[0] eq 'Custom' ? N("Custom") : 
 				      $_[0] eq "Plug'n Play" ? N("Plug'n Play") . ($monitor->{VendorName} eq "Plug'n Play" ? " ($monitor->{ModelName})" : '') :
 				      $_[0] =~ /^Generic\|(.*)/ ? N("Generic") . "|$1" :  
-- 
cgit v1.2.1