From: Peter Hutterer Date: Wed, 25 Jun 2014 01:41:16 +0000 (+1000) Subject: Drop the deprecated libinput_udev_create_for_seat() X-Git-Tag: 0.4.0~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=186f6188147d520a417c4215f27b81eadec66c24;p=platform%2Fupstream%2Flibinput.git Drop the deprecated libinput_udev_create_for_seat() We have enough API breakage in this release that it's not worth keeping this around. Every caller must be fixed for all the other stuff anyway, so drop this too. Signed-off-by: Peter Hutterer --- diff --git a/src/libinput.h b/src/libinput.h index 47da8518..efd071ec 100644 --- a/src/libinput.h +++ b/src/libinput.h @@ -817,43 +817,6 @@ int libinput_udev_assign_seat(struct libinput *libinput, const char *seat_id); -/** - * @ingroup base - * - * Create a new libinput context from udev, for input devices matching - * the given seat ID. New devices or devices removed will appear as events - * during libinput_dispatch. - * - * libinput_udev_create_for_seat() succeeds even if no input device is - * available in this seat, or if devices are available but fail to open in - * @ref libinput_interface::open_restricted. Devices that do not have the - * minimum capabilities to be recognized as pointer, keyboard or touch - * device are ignored. Such devices and those that failed to open - * ignored until the next call to libinput_resume(). - * - * The reference count of the context is initialized to 1. See @ref - * libinput_unref. - * - * @param interface The callback interface - * @param user_data Caller-specific data passed to the various callback - * interfaces. - * @param udev An already initialized udev context - * @param seat_id A seat identifier. This string must not be NULL. - * - * @return An initialized libinput context, ready to handle events or NULL on - * error. - * - * @deprecated This function was deprecated in 0.4.0 and will be removed - * soon. Use libinput_udev_create_context() and libinput_udev_assign_seat() - * instead. - */ -struct libinput * -libinput_udev_create_for_seat(const struct libinput_interface *interface, - void *user_data, - struct udev *udev, - const char *seat_id) - LIBINPUT_ATTRIBUTE_DEPRECATED; - /** * @ingroup base * diff --git a/src/udev-seat.c b/src/udev-seat.c index 17cb3cb0..635fabfd 100644 --- a/src/udev-seat.c +++ b/src/udev-seat.c @@ -384,26 +384,3 @@ libinput_udev_assign_seat(struct libinput *libinput, return 0; } - -LIBINPUT_EXPORT struct libinput * -libinput_udev_create_for_seat(const struct libinput_interface *interface, - void *user_data, - struct udev *udev, - const char *seat_id) -{ - struct libinput *libinput; - - if (!interface || !udev || !seat_id) - return NULL; - - libinput = libinput_udev_create_context(interface, user_data, udev); - if (!libinput) - return NULL; - - if (libinput_udev_assign_seat(libinput, seat_id) != 0) { - libinput_unref(libinput); - libinput = NULL; - } - - return libinput; -}