diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c index f3b648178..242eb8dc9 100644 --- a/clutter/clutter/x11/clutter-backend-x11.c +++ b/clutter/clutter/x11/clutter-backend-x11.c @@ -948,30 +948,6 @@ clutter_x11_set_display (Display *xdpy) _foreign_dpy= xdpy; } -/** - * clutter_x11_enable_xinput: - * - * Enables the use of the XInput extension if present on connected - * XServer and support built into Clutter. XInput allows for multiple - * pointing devices to be used. - * - * This function must be called before clutter_init(). - * - * Since XInput might not be supported by the X server, you might - * want to use clutter_x11_has_xinput() to see if support was enabled. - * - * Since: 0.8 - * - * Deprecated: 1.14: This function does not do anything; XInput support - * is enabled by default in Clutter. Use the CLUTTER_DISABLE_XINPUT - * environment variable to disable XInput support and use Xlib core - * events instead. - */ -void -clutter_x11_enable_xinput (void) -{ -} - /** * clutter_x11_disable_event_retrieval: * @@ -1180,31 +1156,6 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func, } } -/** - * clutter_x11_get_input_devices: - * - * Retrieves a pointer to the list of input devices - * - * Deprecated: 1.2: Use clutter_device_manager_peek_devices() instead - * - * Since: 0.8 - * - * Return value: (transfer none) (element-type Clutter.InputDevice): a - * pointer to the internal list of input devices; the returned list is - * owned by Clutter and should not be modified or freed - */ -const GSList * -clutter_x11_get_input_devices (void) -{ - ClutterDeviceManager *manager; - - manager = clutter_device_manager_get_default (); - if (manager == NULL) - return NULL; - - return clutter_device_manager_peek_devices (manager); -} - /** * clutter_x11_has_xinput: * diff --git a/clutter/clutter/x11/clutter-x11.h b/clutter/clutter/x11/clutter-x11.h index 1df9cd05d..dd3878c14 100644 --- a/clutter/clutter/x11/clutter-x11.h +++ b/clutter/clutter/x11/clutter-x11.h @@ -128,11 +128,6 @@ gboolean clutter_x11_has_event_retrieval (void); CLUTTER_EXPORT ClutterStage *clutter_x11_get_stage_from_window (Window win); -CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices) -const GSList* clutter_x11_get_input_devices (void); - -CLUTTER_DEPRECATED -void clutter_x11_enable_xinput (void); CLUTTER_EXPORT gboolean clutter_x11_has_xinput (void);