[gtk/remove-xim] Remove the XIM input method
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/remove-xim] Remove the XIM input method
- Date: Sat, 16 Nov 2019 21:07:41 +0000 (UTC)
commit a439be516151380092d90daa6e53f9f518e352f7
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Nov 16 21:05:25 2019 +0000
Remove the XIM input method
It's old and busted, and mostly broken in weird ways when it comes to
extended input devices. All that XIM does, these days, is make a mess
when people enable it by mistake.
gtk/gtkimcontextxim.c | 1696 -------------------------------------------------
gtk/gtkimcontextxim.h | 47 --
gtk/gtkimmodule.c | 11 -
gtk/meson.build | 1 -
4 files changed, 1755 deletions(-)
---
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index a4c90dac13..2f4127faa7 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -42,7 +42,6 @@
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
-#include "gtkimcontextxim.h"
#endif
#ifdef GDK_WINDOWING_WAYLAND
@@ -126,13 +125,6 @@ match_backend (GdkDisplay *display,
return FALSE;
#endif
- if (g_strcmp0 (context_id, "xim") == 0)
-#ifdef GDK_WINDOWING_X11
- return GDK_IS_X11_DISPLAY (display);
-#else
- return FALSE;
-#endif
-
if (g_strcmp0 (context_id, "ime") == 0)
#ifdef GDK_WINDOWING_WIN32
return GDK_IS_WIN32_DISPLAY (display);
@@ -270,9 +262,6 @@ gtk_im_modules_init (void)
gtk_im_module_ensure_extension_point ();
g_type_ensure (gtk_im_context_simple_get_type ());
-#ifdef GDK_WINDOWING_X11
- g_type_ensure (gtk_im_context_xim_get_type ());
-#endif
#ifdef GDK_WINDOWING_WAYLAND
g_type_ensure (gtk_im_context_wayland_get_type ());
#endif
diff --git a/gtk/meson.build b/gtk/meson.build
index bdfb7294b7..c083509f47 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -748,7 +748,6 @@ endif
if x11_enabled
gtk_sources += ['gtkapplication-x11.c', 'gtkmountoperation-x11.c']
- gtk_sources += ['gtkimcontextxim.c']
endif
if wayland_enabled
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]