[gnome-desktop] gnome-rr: make config use display name from output

[William Jon McCann <mccann src gnome org>]

commit 5756c24ce001938ee195252c9d59a42f6cc2ebad
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Feb 14 11:23:18 2013 -0500

    gnome-rr: make config use display name from output

 libgnome-desktop/gnome-rr-config.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index d098c71..4f02509 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -521,6 +521,7 @@ gnome_rr_config_load_current (GnomeRRConfig *config, GError **error)
 
        output->priv->name = g_strdup (gnome_rr_output_get_name (rr_output));
        output->priv->connected = gnome_rr_output_is_connected (rr_output);
+       output->priv->display_name = g_strdup (gnome_rr_output_get_display_name (rr_output));
 
        if (!output->priv->connected)
        {
@@ -553,12 +554,6 @@ gnome_rr_config_load_current (GnomeRRConfig *config, GError **error)
                output->priv->product = 0;
                output->priv->serial = 0;
            }
-
-           if (gnome_rr_output_is_laptop (rr_output))
-               output->priv->display_name = g_strdup (_("Laptop"));
-           else
-               output->priv->display_name = make_display_name (info);
-               
            g_free (info);
                
            crtc = gnome_rr_output_get_crtc (rr_output);