Move spi_clear_error_state() to the X11 code

Both deviceeventcontroller.c and deviceeventcontroller-x11.c had
static spi_error_code variables, but spi_clear_error_state() was
looking at a different variable than the one set by the X error
handler.  I think this was just an oversight.

3 files changed, 8 insertions, 13 deletions

diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index 010fdf0a..557410af 100644
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -677,6 +677,14 @@ global_filter_fn (XEvent *xevent, void *data)
   return;
 }
 
+static gboolean
+spi_clear_error_state (void)
+{
+	gboolean retval = spi_error_code != 0;
+	spi_error_code = 0;
+	return retval;
+}
+
 static int
 _spi_controller_device_error_handler (Display *display, XErrorEvent *error)
 {
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 8c9c8f8a..c68909c5 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -70,9 +70,6 @@ typedef struct {
 } SpiDEControllerPrivate;
 #endif
 
-/* A pointer to our parent object class */
-static int spi_error_code = 0;
-
 typedef struct {
     gint x;
     gint y;
@@ -1234,14 +1231,6 @@ spi_controller_notify_keylisteners (SpiDEController                 *controller,
 }
 
 gboolean
-spi_clear_error_state (void)
-{
-	gboolean retval = spi_error_code != 0;
-	spi_error_code = 0;
-	return retval;
-}
-
-gboolean
 spi_controller_update_key_grabs (SpiDEController           *controller,
 				 Accessibility_DeviceEvent *recv)
 {
diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index 46ea1697..691a3afa 100644
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -141,8 +141,6 @@ GType            spi_device_event_controller_get_type (void);
 SpiDEController *spi_device_event_controller_new      (SpiRegistry    *registry,
                                                        DBusConnection *bus);
 
-gboolean spi_clear_error_state (void);
-
 void spi_device_event_controller_start_poll_mouse (SpiRegistry *registry);
 void spi_device_event_controller_stop_poll_mouse (void);