1 files changed, 1 insertions, 29 deletions
diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index d5cae611..5bf37e5d 100644
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -42,11 +42,11 @@
 
 #include <dbus/dbus.h>
 
-#include "de-marshaller.h"
 #include "de-types.h"
 #include "display.h"
 #include "event-source.h"
 #include "keymasks.h"
+#include "marshal-dbus.h"
 #include "paths.h"
 
 #include "deviceeventcontroller.h"
@@ -418,32 +418,6 @@ spi_dec_ungrab_mouse (gpointer data)
 #endif
 
 static void
-spi_dec_init_mouse_listener (SpiDEController *dec)
-{
-#ifdef GRAB_BUTTON
-  Display *display = spi_get_display ();
-
-  if (display)
-    {
-      if (XGrabButton (display, AnyButton, AnyModifier,
-                       spi_get_root_window (),
-                       True, ButtonPressMask | ButtonReleaseMask,
-                       GrabModeSync, GrabModeAsync, None, None) != Success)
-        {
-#ifdef SPI_DEBUG
-          fprintf (stderr, "WARNING: could not grab mouse buttons!\n");
-#endif
-          ;
-        }
-      XSync (display, False);
-#ifdef SPI_DEBUG
-      fprintf (stderr, "mouse buttons grabbed\n");
-#endif
-    }
-#endif
-}
-
-static void
 spi_dec_clear_unlatch_pending (SpiDEController *controller)
 {
   SpiDEControllerPrivate *priv = spi_device_event_controller_get_instance_private (controller);
@@ -1213,8 +1187,6 @@ spi_dec_x11_init (SpiDEController *controller)
   gettimeofday (&priv->last_release_time, NULL);
   spi_controller_register_with_devices (controller);
 
-  spi_dec_init_mouse_listener (controller);
-
   saved_controller = controller;
 }