Commit 48d8af85 authored by Matthias Clasen's avatar Matthias Clasen

Make gdk_display_open_default_libgtk_only more robust

Make this function return NULL if GDK could not be
initialized. We check this by seeing if there is a
display manager singleton.
parent c5d7871e
......@@ -350,7 +350,7 @@ gdk_get_display_arg_name (void)
* Opens the default display specified by command line arguments or
* environment variables, sets it as the default display, and returns
* it. gdk_parse_args must have been called first. If the default
* it. gdk_parse_args() must have been called first. If the default
* display has previously been set, simply returns that. An internal
* function that should not be used by applications.
......@@ -364,6 +364,9 @@ gdk_display_open_default_libgtk_only (void)
g_return_val_if_fail (gdk_initialized, NULL);
if (gdk_display_manager_peek () == NULL)
return NULL;
display = gdk_display_get_default ();
if (display)
return display;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment