spi_controller_notify_mouselisteners(): Remove

This function immediately returns FALSE if there are no
controller->mouse_listeners.

The only place that ever added to the controller->mouse_listeners list
was spi_controller_register_device_listener(), which we removed in the
last commit.

So, remove the function altogether and make the two callers do as if
it just returned FALSE.

3 files changed, 1 insertions, 72 deletions

diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index 557410af..b553b3d7 100644
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -352,9 +352,7 @@ spi_dec_button_update_and_emit (SpiDEController *controller,
 	mouse_e.timestamp = 0;
 	mouse_e.event_string = "";
 	mouse_e.is_text   = FALSE;
-	is_consumed = 
-	  spi_controller_notify_mouselisteners (controller, 
-						&mouse_e);
+	is_consumed = FALSE;
 	if (!is_consumed)
 	  {
 	    dbus_uint32_t x = last_mouse_pos->x, y = last_mouse_pos->y;
@@ -531,8 +529,6 @@ spi_device_event_controller_forward_mouse_event (SpiDEController *controller,
 	spi_dec_x11_emit_modifier_event (controller, 
 				     mouse_mask_state, mouse_button_state);
       mouse_mask_state = mouse_button_state;
-      is_consumed = 
-	spi_controller_notify_mouselisteners (controller, &mouse_e);
       ix = last_mouse_pos->x;
       iy = last_mouse_pos->y;
       spi_dec_dbus_emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "Button", event_detail, ix, iy);
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 4ecaa2a2..afa443c9 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -985,69 +985,6 @@ Accessibility_DeviceEventListener_NotifyEvent(SpiDEController *controller,
   return consumed;
 }
 
-gboolean
-spi_controller_notify_mouselisteners (SpiDEController                 *controller,
-				      const Accessibility_DeviceEvent *event)
-{
-  GList   *l;
-  GSList  *notify = NULL, *l2;
-  GList  **listeners = &controller->mouse_listeners;
-  gboolean is_consumed;
-#ifdef SPI_KEYEVENT_DEBUG
-  gboolean found = FALSE;
-#endif
-  if (!listeners)
-    {
-      return FALSE;
-    }
-
-  for (l = *listeners; l; l = l->next)
-    {
-       DEControllerListener *listener = l->data;
-
-       if (eventtype_seq_contains_event (listener->types, event))
-         {
-	   /* we clone (don't dup) the listener, to avoid refcount inc. */
-	   notify = g_slist_prepend (notify,
-				     spi_listener_clone (listener));
-#ifdef SPI_KEYEVENT_DEBUG
-           found = TRUE;
-#endif
-         }
-    }
-
-#ifdef SPI_KEYEVENT_DEBUG
-  if (!found)
-    {
-      g_print ("no match for event\n");
-    }
-#endif
-
-  is_consumed = FALSE;
-  for (l2 = notify; l2 && !is_consumed; l2 = l2->next)
-    {
-      DEControllerListener *listener = l2->data;
-
-      is_consumed = Accessibility_DeviceEventListener_NotifyEvent (controller, listener, event);
-
-      spi_listener_clone_free ((DEControllerListener *) l2->data);
-    }
-
-  for (; l2; l2 = l2->next)
-    {
-      DEControllerListener *listener = l2->data;
-      spi_listener_clone_free (listener);
-      /* clone doesn't have its own ref, so don't use spi_device_listener_free */
-    }
-
-  g_slist_free (notify);
-
-#ifdef SPI_DEBUG
-  if (is_consumed) g_message ("consumed\n");
-#endif
-  return is_consumed;
-}
-
 static gboolean
 key_set_contains_key (GSList                          *key_set,
 			  const Accessibility_DeviceEvent *key_event)
diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index 53b17da1..100d2e90 100644
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -149,10 +149,6 @@ void spi_remove_device_listeners (SpiDEController *controller, const char *bus_n
 SpiDEController *spi_registry_dec_new (DBusConnection *bus);
 
 gboolean
-spi_controller_notify_mouselisteners (SpiDEController                 *controller,
-				      const Accessibility_DeviceEvent *event);
-
-gboolean
 spi_controller_notify_keylisteners (SpiDEController                 *controller,
 				    Accessibility_DeviceEvent       *key_event,
 				    dbus_bool_t                    is_system_global);