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

Don't load print backends more than once

Browse Source 
The modules don't depend on the default display
at all, and loading them more than once makes
the displayclose test fail here, locally.
This commit is contained in:
Matthias Clasen
2019-05-27 12:59:36 +00:00
parent 1f21badd72
commit cfe648eb11
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkmain.c
View File

@@ -642,11 +642,6 @@ static void
default_display_notify_cb (GdkDisplayManager *dm)
{
debug_flags[0].display = gdk_display_get_default ();
#ifdef G_OS_UNIX
gtk_print_backends_init ();
#endif
gtk_im_modules_init ();
gtk_media_file_extension_init ();
_gtk_accessibility_init ();
}
@@ -673,6 +668,12 @@ do_post_parse_initialization (void)
gtk_initialized = TRUE;
#ifdef G_OS_UNIX
gtk_print_backends_init ();
#endif
gtk_im_modules_init ();
gtk_media_file_extension_init ();
display_manager = gdk_display_manager_get ();
if (gdk_display_manager_get_default_display (display_manager) != NULL)
default_display_notify_cb (display_manager);