From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 30 Oct 2017 23:27:36 +0000 (-0400)
Subject: immodule: Avoid GdkScreen api
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~1048
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=297889e080234a2cc9427cd3711e92a9817fd1b2;p=gtk4.git

immodule: Avoid GdkScreen api

Another place where it is not needed.
---

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index ea1990b3d7..f3f25409bc 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -874,7 +874,6 @@ _gtk_im_module_get_default_context_id (void)
   gint i;
   gchar *tmp_locale, *tmp, **immodules;
   const gchar *envvar;
-  GdkScreen *screen;
   GtkSettings *settings;
 
   if (!contexts_hash)
@@ -891,10 +890,8 @@ _gtk_im_module_get_default_context_id (void)
           return context_id;
     }
 
-  /* Check if the certain immodule is set in XSETTINGS.
-   */
-  screen = gdk_screen_get_default ();
-  settings = gtk_settings_get_for_screen (screen);
+  /* Check if the certain immodule is set in XSETTINGS. */
+  settings = gtk_settings_get_default ();
   g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
   if (tmp)
     {