diff options
| author | Carsten Haitzler <raster@rasterman.com> | 2012-03-07 08:13:06 +0000 |
|---|---|---|
| committer | Carsten Haitzler <raster@rasterman.com> | 2012-03-07 08:13:06 +0000 |
| commit | 64a93a3374a124daff04758455d13d98fadc87d4 (patch) | |
| tree | ad8714167daf590a9ff2849d8242cabbb8f186c6 | |
| parent | de725bfc08b663b928b6dfbd00f184e9a0d18417 (diff) | |
| download | elementary-64a93a3374a124daff04758455d13d98fadc87d4.tar.gz | |
warn--
SVN revision: 68892
| -rw-r--r-- | src/lib/elm_gesture_layer.c | 11 | ||||
| -rw-r--r-- | src/lib/elm_spinner.c | 4 | ||||
| -rw-r--r-- | src/lib/elm_spinner.h | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c index cd0798a38..cc696e85b 100644 --- a/src/lib/elm_gesture_layer.c +++ b/src/lib/elm_gesture_layer.c @@ -1570,13 +1570,14 @@ _n_long_tap_test(Evas_Object *obj, Pointer_Event *pe, * @ingroup Elm_Gesture_Layer */ static void -_set_momentum(Elm_Gesture_Momentum_Info *momentum, Evas_Coord x1, Evas_Coord y1, - Evas_Coord x2, Evas_Coord y2, unsigned int t1x, unsigned int t1y, - unsigned int t2) +_set_momentum(Elm_Gesture_Momentum_Info *momentum, + Evas_Coord xx1, Evas_Coord yy1, + Evas_Coord xx2, Evas_Coord yy2, + unsigned int t1x, unsigned int t1y, unsigned int t2) { Evas_Coord velx = 0, vely = 0, vel; - Evas_Coord dx = x2 - x1; - Evas_Coord dy = y2 - y1; + Evas_Coord dx = xx2 - xx1; + Evas_Coord dy = yy2 - yy1; int dtx = t2 - t1x; int dty = t2 - t1y; if (dtx > 0) diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index 6ea83f6e5..43fd4a382 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -804,12 +804,12 @@ elm_spinner_base_get(const Evas_Object *obj) } EAPI void -elm_spinner_round_set(Evas_Object *obj, int round) +elm_spinner_round_set(Evas_Object *obj, int rnd) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - wd->round = round; + wd->round = rnd; } EAPI int diff --git a/src/lib/elm_spinner.h b/src/lib/elm_spinner.h index 688f5df55..bc712d6a4 100644 --- a/src/lib/elm_spinner.h +++ b/src/lib/elm_spinner.h @@ -404,7 +404,7 @@ EAPI double elm_spinner_base_get(const Evas_Object *obj); * * @ingroup Spinner */ -EAPI void elm_spinner_round_set(Evas_Object *obj, int round); +EAPI void elm_spinner_round_set(Evas_Object *obj, int rnd); /** * Get the round value for rounding |