From 9747277b7e47fff5d0c7a9d2a60ede18b00a1d55 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 12 Jun 2015 00:49:39 -0400
Subject: [PATCH] Revert "input-settings-x11: Use xcb to change input settings"

This reverts commit 989f9630a43fe0c6efab64ea36e8a0e909d97c19.

xcb is not smart enough to properly submit requests for
XIChangeProperty. Let's revert this until we can fix xcb.
---
 configure.ac                               | 1 -
 src/backends/x11/meta-input-settings-x11.c | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index b089a6616..88d162a5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,6 @@ MUTTER_PC_MODULES="
    xrender
    x11-xcb
    xcb-randr
-   xcb-xinput
 "
 
 GLIB_GSETTINGS
diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
index a1b46dded..f683c4788 100644
--- a/src/backends/x11/meta-input-settings-x11.c
+++ b/src/backends/x11/meta-input-settings-x11.c
@@ -30,9 +30,7 @@
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput2.h>
-#include <X11/Xlib-xcb.h>
 #include <X11/XKBlib.h>
-#include <xcb/xinput.h>
 
 #include <meta/errors.h>
 
@@ -80,7 +78,6 @@ change_property (ClutterInputDevice *device,
 {
   MetaBackend *backend = meta_get_backend ();
   Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
-  xcb_connection_t *xcb_conn = XGetXCBConnection (xdisplay);
   int device_id;
   Atom property_atom;
   guchar *data_ret;
@@ -92,9 +89,8 @@ change_property (ClutterInputDevice *device,
   if (!data_ret)
     return;
 
-  xcb_input_xi_change_property (xcb_conn, device_id, XCB_PROP_MODE_REPLACE,
-                                format, property_atom, type,
-                                nitems, data);
+  XIChangeProperty (xdisplay, device_id, property_atom, type,
+                    format, XIPropModeReplace, data, nitems);
   meta_XFree (data_ret);
 }