callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make gdk_display_open_default_libgtk_only more robust

Browse Source 
Make this function return NULL if GDK could not be
initialized. We check this by seeing if there is a
display manager singleton.
This commit is contained in:
Matthias Clasen
2013-03-23 19:40:16 -04:00
parent c5d7871eda
commit 48d8af85d0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/gdk.c
View File

@ -350,7 +350,7 @@ gdk_get_display_arg_name (void)
* *
* Opens the default display specified by command line arguments or * Opens the default display specified by command line arguments or
* environment variables, sets it as the default display, and returns * 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 * display has previously been set, simply returns that. An internal
* function that should not be used by applications. * 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); g_return_val_if_fail (gdk_initialized, NULL);
if (gdk_display_manager_peek () == NULL)
return NULL;
display = gdk_display_get_default (); display = gdk_display_get_default ();
if (display) if (display)
return display; return display;