From 5aa02c0378199609f1ee42eb8645108ae06e73a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 10 Mar 2017 15:12:52 +0800 Subject: [PATCH] monitor-manager-kms: Improve EDID error reporting Include the connector name in the error message, and only include the reason in the GError message. https://bugzilla.gnome.org/show_bug.cgi?id=779837 --- src/backends/native/meta-monitor-manager-kms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c index bad4fb641..3cedde118 100644 --- a/src/backends/native/meta-monitor-manager-kms.c +++ b/src/backends/native/meta-monitor-manager-kms.c @@ -332,7 +332,7 @@ read_edid_blob (MetaMonitorManagerKms *manager_kms, if (!edid_blob) { g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), - "Failed to get EDID property blob: %s", strerror (errno)); + "%s", strerror (errno)); return NULL; } @@ -907,7 +907,8 @@ init_output (MetaOutput *output, edid = read_output_edid (manager_kms, output, &error); if (!edid) { - g_warning ("Failed to read EDID: %s", error->message); + g_warning ("Failed to read EDID blob from %s: %s", + output->name, error->message); g_error_free (error); } }