From cfe648eb11a1f6710e106da5525d92dcf4f17c43 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 May 2019 12:59:36 +0000 Subject: [PATCH] Don't load print backends more than once The modules don't depend on the default display at all, and loading them more than once makes the displayclose test fail here, locally. --- gtk/gtkmain.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 2006c0d862..d4d79f650e 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -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);