* src/xterm.c (init_xterm): Use more reliable method to disable XI2.

diff --git a/src/xterm.c b/src/xterm.c
index 9c24a074e3d44a523974771c79a17932282f24f3..60d87ccbf0962d7c94f0ceff55ad28299fb288f6 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -16952,7 +16952,11 @@ init_xterm (void)
   /* Emacs can handle only core input events when built without XI2
      support, so make sure Gtk doesn't use Xinput or Xinput2
      extensions.  */
+#ifndef HAVE_GTK3
   xputenv ("GDK_CORE_DEVICE_EVENTS=1");
+#else
+  gdk_disable_multidevice ();
+#endif
 #endif
 }
 #endif