From ca76675a6948ea113e15d7b455f2de2cd69ab26b Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 8 Jan 2019 00:22:14 +0100
Subject: immodule: Pass a GdkDisplay for default context ID

After all, the context depends on the display - we want to use the
wayland context for Wayland,  xim for X11 and so on.
---
 gtk/gtkimmulticontext.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gtk/gtkimmulticontext.c')

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index aae9b6d0ae..e075adfbc3 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -244,11 +244,17 @@ static const gchar *
 get_effective_context_id (GtkIMMulticontext *multicontext)
 {
   GtkIMMulticontextPrivate *priv = multicontext->priv;
+  GdkDisplay *display;
 
   if (priv->context_id_aux)
     return priv->context_id_aux;
 
-  return _gtk_im_module_get_default_context_id ();
+  if (priv->client_widget)
+    display = gtk_widget_get_display (priv->client_widget);
+  else
+    display = gdk_display_get_default ();
+
+  return _gtk_im_module_get_default_context_id (display);
 }
 
 static GtkIMContext *
-- 
cgit v1.2.1