Merge branch 'query-wayland-registry' into 'master'

gtkimmodule: make match_backend() query

See merge request GNOME/gtk!56
This commit is contained in:
Matthias Clasen 2018-03-13 02:09:26 +00:00
commit 3b45019ba2

View File

@ -119,7 +119,13 @@ match_backend (const char *context_id)
{
#ifdef GDK_WINDOWING_WAYLAND
if (g_strcmp0 (context_id, "wayland") == 0)
return GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ());
{
GdkDisplay *display = gdk_display_get_default ();
return GDK_IS_WAYLAND_DISPLAY (display) &&
gdk_wayland_display_query_registry (display,
"gtk_text_input_manager");
}
#endif
#ifdef GDK_WINDOWING_BROADWAY