[gtk] settings: Don't special case IM modules



commit 5e96129be1698287a54ebadbcd0f5d08d219ff91
Author: Benjamin Otte <otte redhat com>
Date:   Tue Jan 8 00:39:15 2019 +0100

    settings: Don't special case IM modules
    
    The previous fixes made it unnecessary to hardcode IM modules for
    different display types. The code now automatically skips system IM
    modules for other displays.

 gtk/gtksettings.c | 27 ---------------------------
 1 file changed, 27 deletions(-)
---
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 3a6cbab86b..ad477d7cbd 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1152,33 +1152,6 @@ gtk_settings_create_for_display (GdkDisplay *display)
                              "gtk-shell-shows-menubar", TRUE,
                              NULL);
   else
-#endif
-#ifdef GDK_WINDOWING_BROADWAY
-    if (GDK_IS_BROADWAY_DISPLAY (display))
-      settings = g_object_new (GTK_TYPE_SETTINGS,
-                               "gtk-im-module", "broadway",
-                               NULL);
-  else
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-    if (GDK_IS_WAYLAND_DISPLAY (display))
-      {
-        if (gdk_wayland_display_query_registry (display,
-                                                "zwp_text_input_manager_v3"))
-          {
-            settings = g_object_new (GTK_TYPE_SETTINGS,
-                                     "gtk-im-module", "wayland",
-                                     NULL);
-          }
-        else
-          {
-            /* Fallback to other IM methods if the compositor does not
-             * implement the interface(s).
-             */
-            settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
-          }
-      }
-  else
 #endif
     settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]