diff --git a/clutter/clutter/clutter-swipe-action.c b/clutter/clutter/clutter-swipe-action.c index 2706e1d82..17cd75e5c 100644 --- a/clutter/clutter/clutter-swipe-action.c +++ b/clutter/clutter/clutter-swipe-action.c @@ -172,15 +172,6 @@ gesture_end (ClutterGestureAction *action, g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction); } -/* XXX:2.0 remove */ -static gboolean -clutter_swipe_action_real_swipe (ClutterSwipeAction *action, - ClutterActor *actor, - ClutterSwipeDirection direction) -{ - return TRUE; -} - static void clutter_swipe_action_constructed (GObject *object) { @@ -202,9 +193,6 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass) gesture_class->gesture_progress = gesture_progress; gesture_class->gesture_end = gesture_end; - /* XXX:2.0 remove */ - klass->swipe = clutter_swipe_action_real_swipe; - /** * ClutterSwipeAction::swept: * @action: the #ClutterSwipeAction that emitted the signal @@ -248,8 +236,7 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass) g_signal_new (I_("swipe"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ClutterSwipeActionClass, swipe), - _clutter_boolean_continue_accumulator, NULL, + 0, g_signal_accumulator_true_handled, NULL, _clutter_marshal_BOOLEAN__OBJECT_FLAGS, G_TYPE_BOOLEAN, 2, CLUTTER_TYPE_ACTOR, diff --git a/clutter/clutter/clutter-swipe-action.h b/clutter/clutter/clutter-swipe-action.h index 1bf50c6bf..44d4766be 100644 --- a/clutter/clutter/clutter-swipe-action.h +++ b/clutter/clutter/clutter-swipe-action.h @@ -85,10 +85,6 @@ struct _ClutterSwipeActionClass ClutterActor *actor, ClutterSwipeDirection direction); - gboolean (* swipe) (ClutterSwipeAction *action, - ClutterActor *actor, - ClutterSwipeDirection direction); - /*< private >*/ void (* _clutter_swipe_action1) (void); void (* _clutter_swipe_action2) (void);