Commit b88bffac authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'wip/carlosg/fix-issue-114' into 'gtk-3-22'

Fix issue #114

See merge request GNOME/gtk!73
parents 9781ffae 4f78abdd
......@@ -697,7 +697,13 @@ match_backend (GtkIMContextInfo *context)
{
#ifdef GDK_WINDOWING_WAYLAND
if (g_strcmp0 (context->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
......
......@@ -420,6 +420,9 @@ released_cb (GtkGestureMultiPress *gesture,
{
GtkInputHints hints;
if (!global->current)
return;
g_object_get (context, "input-hints", &hints, NULL);
if (n_press == 1 &&
......
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