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 70a1a1084eb455556be562477e39e37238b1c09a..33109a0bc88bbfbe359e055efa882d9f5052ece0 100644 (file)
--- 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 bf87567de28e2a2c186a22afc729b6f1506ac799..ca1d668f8ad9160864ab50565201ee1df18f6714 100644 (file)
--- 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