diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list index fc7680db6..7eff755a9 100644 --- a/clutter/clutter-marshal.list +++ b/clutter/clutter-marshal.list @@ -4,7 +4,6 @@ BOOLEAN:OBJECT,BOOLEAN BOOLEAN:OBJECT,BOXED,DOUBLE BOOLEAN:OBJECT,DOUBLE BOOLEAN:OBJECT,ENUM -BOOLEAN:OBJECT,FLAGS BOOLEAN:STRING,UINT,FLAGS BOOLEAN:OBJECT BOOLEAN:OBJECT,FLOAT,FLOAT diff --git a/clutter/clutter-swipe-action.c b/clutter/clutter-swipe-action.c index 4b41bb66a..7ccf37ab7 100644 --- a/clutter/clutter-swipe-action.c +++ b/clutter/clutter-swipe-action.c @@ -59,7 +59,6 @@ struct _ClutterSwipeActionPrivate enum { SWEPT, - SWIPE, LAST_SIGNAL }; @@ -142,7 +141,6 @@ gesture_end (ClutterGestureAction *action, gfloat press_x, press_y; gfloat release_x, release_y; ClutterSwipeDirection direction = 0; - gboolean can_emit_swipe; clutter_gesture_action_get_press_coords (action, 0, @@ -162,11 +160,7 @@ gesture_end (ClutterGestureAction *action, else if (press_y - release_y > priv->threshold) direction |= CLUTTER_SWIPE_DIRECTION_UP; - /* XXX:2.0 remove */ - g_signal_emit (action, swipe_signals[SWIPE], 0, actor, direction, - &can_emit_swipe); - if (can_emit_swipe) - g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction); + g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction); } static void @@ -190,8 +184,6 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass) * The ::swept signal is emitted when a swipe gesture is recognized on the * attached actor. * - * Deprecated: 1.14: Use the ::swipe signal instead. - * * Since: 1.8 */ swipe_signals[SWEPT] = @@ -204,31 +196,6 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass) G_TYPE_NONE, 2, CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_SWIPE_DIRECTION); - - /** - * ClutterSwipeAction::swipe: - * @action: the #ClutterSwipeAction that emitted the signal - * @actor: the #ClutterActor attached to the @action - * @direction: the main direction of the swipe gesture - * - * The ::swipe signal is emitted when a swipe gesture is recognized on the - * attached actor. - * - * Return value: %TRUE if the pan should continue, and %FALSE if - * the pan should be cancelled. - * - * Since: 1.14 - */ - swipe_signals[SWIPE] = - g_signal_new (I_("swipe"), - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ClutterSwipeActionClass, swipe), - _clutter_boolean_continue_accumulator, NULL, - _clutter_marshal_BOOLEAN__OBJECT_FLAGS, - G_TYPE_BOOLEAN, 2, - CLUTTER_TYPE_ACTOR, - CLUTTER_TYPE_SWIPE_DIRECTION); } static void diff --git a/clutter/clutter-swipe-action.h b/clutter/clutter-swipe-action.h index 395c8170c..4356d9182 100644 --- a/clutter/clutter-swipe-action.h +++ b/clutter/clutter-swipe-action.h @@ -83,10 +83,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);