From 9222b4cd7cf6f5e802d350888e04058ca27290a8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 28 Sep 2016 02:51:09 +0200 Subject: [PATCH] inspector: Use display name instead of screen name This is for future compatibility as they are guaranteed to be identical. --- gtk/inspector/general.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 35231b5b39..44dbe3ebe8 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -374,7 +374,6 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel) static void populate_display (GdkScreen *screen, GtkInspectorGeneral *gen) { - gchar *name; gint i; GList *children, *l; GtkWidget *child; @@ -396,9 +395,9 @@ populate_display (GdkScreen *screen, GtkInspectorGeneral *gen) } g_list_free (children); - name = gdk_screen_make_display_name (screen); - gtk_label_set_label (GTK_LABEL (gen->priv->display_name), name); - g_free (name); + display = gdk_screen_get_display (screen); + + gtk_label_set_label (GTK_LABEL (gen->priv->display_name), gdk_display_get_name (display)); if (gdk_screen_get_rgba_visual (screen) != NULL) gtk_widget_show (gen->priv->display_rgba); @@ -406,7 +405,6 @@ populate_display (GdkScreen *screen, GtkInspectorGeneral *gen) if (gdk_screen_is_composited (screen)) gtk_widget_show (gen->priv->display_composited); - display = gdk_screen_get_display (screen); n_monitors = gdk_display_get_n_monitors (display); for (i = 0; i < n_monitors; i++) {