diff options
author | Benjamin Otte <otte@redhat.com> | 2019-01-08 00:39:15 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2019-01-08 00:41:12 +0100 |
commit | 5e96129be1698287a54ebadbcd0f5d08d219ff91 (patch) | |
tree | 3450e8f4ba9c2e6511ccf5daa7737fa2809594aa /gtk/gtksettings.c | |
parent | 0ef7d0788084ad8054418300eaa76fd1861dfe51 (diff) | |
download | gtk+-5e96129be1698287a54ebadbcd0f5d08d219ff91.tar.gz |
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.
Diffstat (limited to 'gtk/gtksettings.c')
-rw-r--r-- | gtk/gtksettings.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 3a6cbab86b..ad477d7cbd 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1153,33 +1153,6 @@ gtk_settings_create_for_display (GdkDisplay *display) 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); settings->priv->display = display; |