thanks for your job but can you add deprecated apis into elm_deprecated.h? then we can keep history of deprecated apis and jiyoun will work on fixing trunk based on that. On Mar 7, 2012 8:56 AM, "Enlightenment SVN" <no-re...@enlightenment.org> wrote:
> Log: > elementary/elm_photocam: change api name and add 'do_gesture' variable > > Author: xhell > Date: 2012-03-06 15:56:02 -0800 (Tue, 06 Mar 2012) > New Revision: 68859 > Trac: http://trac.enlightenment.org/e/changeset/68859 > > Modified: > trunk/elementary/src/bin/test_photocam.c > trunk/elementary/src/lib/elm_photocam.c > trunk/elementary/src/lib/elm_photocam.h > > Modified: trunk/elementary/src/bin/test_photocam.c > =================================================================== > --- trunk/elementary/src/bin/test_photocam.c 2012-03-06 23:52:09 UTC > (rev 68858) > +++ trunk/elementary/src/bin/test_photocam.c 2012-03-06 23:56:02 UTC > (rev 68859) > @@ -176,7 +176,7 @@ > static void > my_bt_gesture(void *data, Evas_Object *obj __UNUSED__, void *event_info > __UNUSED__) > { > - elm_photocam_gesture_set(data, !elm_photocam_gesture_get(data)); > + elm_photocam_gesture_enabled_set(data, > !elm_photocam_gesture_enabled_get(data)); > } > > static void > > Modified: trunk/elementary/src/lib/elm_photocam.c > =================================================================== > --- trunk/elementary/src/lib/elm_photocam.c 2012-03-06 23:52:09 UTC > (rev 68858) > +++ trunk/elementary/src/lib/elm_photocam.c 2012-03-06 23:56:02 UTC > (rev 68859) > @@ -98,6 +98,7 @@ > Eina_Bool on_hold : 1; > Eina_Bool paused : 1; > Eina_Bool do_region : 1; > + Eina_Bool do_gesture : 1; > Eina_Bool zoom_gest : 1; > }; > > @@ -1925,12 +1926,12 @@ > } > > EAPI void > -elm_photocam_gesture_set(Evas_Object *obj, Eina_Bool gesture) > +elm_photocam_gesture_enabled_set(Evas_Object *obj, Eina_Bool gesture) > { > ELM_CHECK_WIDTYPE(obj, widtype); > Widget_Data *wd = elm_widget_data_get(obj); > if (!wd) return; > - if ((wd->gest && !!gesture) || (!wd->gest && !gesture)) return; > + if (wd->do_gesture == !!gesture) return; > > if (wd->gest) > { > @@ -1941,6 +1942,7 @@ > if (gesture) > { > wd->gest = elm_gesture_layer_add(wd->obj); > + if (!wd->gest) return; > elm_gesture_layer_attach(wd->gest, wd->obj); > elm_gesture_layer_cb_set(wd->gest, ELM_GESTURE_ZOOM, > ELM_GESTURE_STATE_START, > _gzoom_start, wd); > @@ -1951,16 +1953,16 @@ > elm_gesture_layer_cb_set(wd->gest, ELM_GESTURE_ZOOM, > ELM_GESTURE_STATE_ABORT, > _gzoom_end, wd); > } > + > + wd->do_gesture = !!gesture; > } > > EAPI Eina_Bool > -elm_photocam_gesture_get(const Evas_Object *obj) > +elm_photocam_gesture_enabled_get(const Evas_Object *obj) > { > ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; > Widget_Data *wd = elm_widget_data_get(obj); > if (!wd) return EINA_FALSE; > > - if (wd->gest) > - return EINA_TRUE; > - return EINA_FALSE; > + return wd->do_gesture; > } > > Modified: trunk/elementary/src/lib/elm_photocam.h > =================================================================== > --- trunk/elementary/src/lib/elm_photocam.h 2012-03-06 23:52:09 UTC > (rev 68858) > +++ trunk/elementary/src/lib/elm_photocam.h 2012-03-06 23:56:02 UTC > (rev 68859) > @@ -263,7 +263,7 @@ > * This sets the gesture state to on(EINA_TRUE) or off (EINA_FALSE) for > * photocam. The default is off. This will start multi touch zooming. > */ > -EAPI void elm_photocam_gesture_set(Evas_Object *obj, > Eina_Bool gesture); > +EAPI void elm_photocam_gesture_enabled_set(Evas_Object > *obj, Eina_Bool gesture); > > /** > * @brief Get the gesture state for photocam. > @@ -273,9 +273,9 @@ > * > * This gets the current gesture state for the photocam object. > * > - * @see elm_photocam_gesture_set() > + * @see elm_photocam_gesture_enabled_set() > */ > -EAPI Eina_Bool elm_photocam_gesture_get(const Evas_Object > *obj); > +EAPI Eina_Bool elm_photocam_gesture_enabled_get(const > Evas_Object *obj); > /** > * @} > */ > > > > ------------------------------------------------------------------------------ > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
