[Xfce4-commits] [xfce/xfce4-settings] 11/67: display: Make sure we also get the EDID if only a Laptop is connected

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 897a96d82978a192f8d22313d0832837efcdde28
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Aug 13 23:37:32 2018 +0200

    display: Make sure we also get the EDID if only a Laptop is connected
    
    Users may also want to save multiple profiles for a single Laptop
    display.
---
 dialogs/display-settings/xfce-randr.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dialogs/display-settings/xfce-randr.c b/dialogs/display-settings/xfce-randr.c
index 2bda087..f423d9e 100644
--- a/dialogs/display-settings/xfce-randr.c
+++ b/dialogs/display-settings/xfce-randr.c
@@ -558,13 +558,7 @@ xfce_randr_friendly_name (XfceRandr *randr,
     gchar          *friendly_name = NULL;
     const gchar *name = randr->priv->output_info[output]->name;
 
-    /* special case, a laptop */
-    if (g_str_has_prefix (name, "LVDS")
-        || g_str_has_prefix (name, "eDP")
-        || strcmp (name, "PANEL") == 0)
-        return g_strdup (_("Laptop"));
-
-    /* otherwise, get the vendor & size */
+    /* get the vendor & size */
     xdisplay = gdk_x11_display_get_xdisplay (randr->priv->display);
     edid_data = xfce_randr_read_edid_data (xdisplay, randr->priv->resources->outputs[output_rr_id]);
 
@@ -573,6 +567,12 @@ xfce_randr_friendly_name (XfceRandr *randr,
         randr->priv->edid[output] = g_compute_checksum_for_data (G_CHECKSUM_SHA1 , edid_data, 128);
     }
 
+    /* special case, a laptop */
+    if (g_str_has_prefix (name, "LVDS")
+        || g_str_has_prefix (name, "eDP")
+        || strcmp (name, "PANEL") == 0)
+    return g_strdup (_("Laptop"));
+
     if (info)
         friendly_name = make_display_name (info, output);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.