From eec1298aa1198a679f71e547aadbf0c164eb5803 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Mar 2023 21:44:56 -0400 Subject: [PATCH] Improve an error message We were producing a misleading error message when gtk_init() fails. Fixes: #5704 --- gtk/gtkmain.c | 5 +---- testsuite/gdk/display.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 70a1a1084e..33109a0bc8 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -660,10 +660,7 @@ gtk_init (void) { if (!gtk_init_check ()) { - const char *display_name_arg; - - display_name_arg = getenv ("DISPLAY"); - g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : ""); + g_warning ("Failed to open display"); exit (1); } } diff --git a/testsuite/gdk/display.c b/testsuite/gdk/display.c index bf87567de2..ca1d668f8a 100644 --- a/testsuite/gdk/display.c +++ b/testsuite/gdk/display.c @@ -31,7 +31,7 @@ test_unset_display (void) g_test_trap_subprocess ("/display/unset-display/subprocess/2", 0, 0); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*cannot open display*"); + g_test_trap_assert_stderr ("*Failed to open display*"); } static void @@ -62,7 +62,7 @@ test_bad_display (void) g_test_trap_subprocess ("/display/bad-display/subprocess/2", 0, 0); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*cannot open display*"); + g_test_trap_assert_stderr ("*Failed to open display*"); } int -- 2.30.2