Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve an error message

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

Fixes: #5704
This commit is contained in:
Matthias Clasen
2023-03-27 21:44:56 -04:00
parent 61536ea1a7
commit eec1298aa1
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkmain.c
View File

@@ -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);
}
}

4
testsuite/gdk/display.c
View File

@@ -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