From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 28 Mar 2023 01:44:56 +0000 (-0400)
Subject: Improve an error message
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~4^2~17^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eec1298aa1198a679f71e547aadbf0c164eb5803;p=gtk4.git

Improve an error message

We were producing a misleading error message
when gtk_init() fails.

Fixes: #5704
---

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