summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2014-09-03 14:16:31 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2014-09-03 14:16:31 +0100
commitb3b2af767746fd1b040ff86a15b7452ad89be765 (patch)
tree5a3e14854f66b0c25752ee11716601361af858c5
parent98b64fec33834d5fd8534ba5ac5067fe6f398525 (diff)
downloadclutter-b3b2af767746fd1b040ff86a15b7452ad89be765.tar.gz
Re-introduce removed GestureAction method
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.
-rw-r--r--clutter/clutter-gesture-action.c21
-rw-r--r--clutter/clutter-gesture-action.h4
-rw-r--r--doc/reference/clutter/clutter-sections.txt1
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)
@@ -1282,6 +1282,25 @@ clutter_gesture_action_get_threshold_trigger_edge (ClutterGestureAction *action)
}
/**
+ * 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
* @x: the distance on the horizontal axis
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
<SUBSECTION Private>
ClutterGestureActionPrivate
clutter_gesture_action_get_type
+clutter_gesture_action_get_threshold_trigger_egde
</SECTION>
<SECTION>