From b3b2af767746fd1b040ff86a15b7452ad89be765 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 3 Sep 2014 14:16:31 +0100 Subject: [PATCH] Re-introduce removed GestureAction method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The get_threshold_tigger_egde() method was renamed to fix the typo, but it obviously broke the ABI. To be fair, nobody in the whole of Debian was using the symbol, apparently, so it's not like we broke existing code. Still, it's not nice to break ABI without bumping soname, so let's put the old symbol back in — obviously, deprecated — as a wrapper to the newly added one. --- clutter/clutter-gesture-action.c | 21 ++++++++++++++++++++- clutter/clutter-gesture-action.h | 4 +++- doc/reference/clutter/clutter-sections.txt | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c index ec2cb7bda..6eca26f9c 100644 --- a/clutter/clutter-gesture-action.c +++ b/clutter/clutter-gesture-action.c @@ -1270,7 +1270,7 @@ clutter_gesture_action_set_threshold_trigger_edge (ClutterGestureAction *ac * * Return value: the edge trigger * - * Since: 1.18 + * Since: 1.20 */ ClutterGestureTriggerEdge clutter_gesture_action_get_threshold_trigger_edge (ClutterGestureAction *action) @@ -1281,6 +1281,25 @@ clutter_gesture_action_get_threshold_trigger_edge (ClutterGestureAction *action) return action->priv->edge; } +/** + * clutter_gesture_action_get_threshold_trigger_egde: + * @action: a #ClutterGestureAction + * + * Retrieves the edge trigger of the gesture @action, as set using + * clutter_gesture_action_set_threshold_trigger_edge(). + * + * Return value: the edge trigger + * + * Since: 1.18 + * + * Deprecated: 1.20: Use clutter_gesture_action_get_threshold_trigger_edge() instead. + */ +ClutterGestureTriggerEdge +clutter_gesture_action_get_threshold_trigger_egde (ClutterGestureAction *action) +{ + return clutter_gesture_action_get_threshold_trigger_edge (action); +} + /** * clutter_gesture_action_set_threshold_trigger_distance: * @action: a #ClutterGestureAction diff --git a/clutter/clutter-gesture-action.h b/clutter/clutter-gesture-action.h index f5490413a..ca7db12ce 100644 --- a/clutter/clutter-gesture-action.h +++ b/clutter/clutter-gesture-action.h @@ -159,7 +159,9 @@ void clutter_gesture_action_cancel (ClutterGestu CLUTTER_AVAILABLE_IN_1_18 void clutter_gesture_action_set_threshold_trigger_edge (ClutterGestureAction *action, ClutterGestureTriggerEdge edge); -CLUTTER_AVAILABLE_IN_1_18 +CLUTTER_DEPRECATED_IN_1_20_FOR(clutter_gesture_action_get_threshold_trigger_edge) +ClutterGestureTriggerEdge clutter_gesture_action_get_threshold_trigger_egde (ClutterGestureAction *action); +CLUTTER_AVAILABLE_IN_1_20 ClutterGestureTriggerEdge clutter_gesture_action_get_threshold_trigger_edge (ClutterGestureAction *action); CLUTTER_AVAILABLE_IN_1_18 diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index 0ce387410..7e32de1cb 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -3019,6 +3019,7 @@ CLUTTER_TYPE_GESTURE_ACTION ClutterGestureActionPrivate clutter_gesture_action_get_type +clutter_gesture_action_get_threshold_trigger_egde