[gnome-desktop/randr-connector-type: 3/3] Build a laptop's display name more robustly

[Federico Mena Quintero <federico src gnome org>]

commit 14c78662f95e2885bbf35ff6ba3f150ed749eef7
Author: Federico Mena Quintero <federico novell com>
Date:   Fri Feb 19 14:40:54 2010 -0600

    Build a laptop's display name more robustly
    
    Use gnome_rr_output_is_laptop(), which has better logic
    than what was in make_display_name().  Now that latter function
    just builds display names based on vendor names.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 libgnome-desktop/display-name.c    |   12 ++----------
 libgnome-desktop/edid.h            |    3 +--
 libgnome-desktop/gnome-rr-config.c |    8 +++++---
 3 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/libgnome-desktop/display-name.c b/libgnome-desktop/display-name.c
index f75958b..843c76c 100644
--- a/libgnome-desktop/display-name.c
+++ b/libgnome-desktop/display-name.c
@@ -248,20 +248,12 @@ find_vendor (const char *code)
 };
 
 char *
-make_display_name (const char *output_name,
-		   const MonitorInfo *info)
+make_display_name (const MonitorInfo *info)
 {
     const char *vendor;
     int width_mm, height_mm, inches;
 
-    if (output_name &&
-	(strstr (output_name, "lvds")	||
-	 strstr (output_name, "LVDS")	||
-	 strstr (output_name, "Lvds")))
-    {
-	vendor = _("Laptop");
-    }
-    else if (info)
+    if (info)
     {
 	vendor = find_vendor (info->manufacturer_code);
     }
diff --git a/libgnome-desktop/edid.h b/libgnome-desktop/edid.h
index 3b4e338..55f0bfa 100644
--- a/libgnome-desktop/edid.h
+++ b/libgnome-desktop/edid.h
@@ -189,7 +189,6 @@ struct MonitorInfo
 };
 
 MonitorInfo *decode_edid (const uchar *data);
-char *       make_display_name (const char        *output_name,
-				const MonitorInfo *info);
+char *make_display_name (const MonitorInfo *info);
 
 #endif
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index 6a8f8ae..4e707e5 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -495,9 +495,11 @@ gnome_rr_config_new_current (GnomeRRScreen *screen)
 		output->product = 0;
 		output->serial = 0;
 	    }
-	    
-	    output->display_name = make_display_name (
-		gnome_rr_output_get_name (rr_output), info);
+
+	    if (gnome_rr_output_is_laptop (rr_output))
+		output->display_name = _("Laptop");
+	    else
+		output->display_name = make_display_name (info);
 		
 	    g_free (info);