diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog index 24dc6ec3a5..6d998ed331 100644 --- a/legacy/edje/ChangeLog +++ b/legacy/edje/ChangeLog @@ -355,3 +355,8 @@ edje_object_part_text_input_panel_imdata_set/get edje_object_part_text_input_panel_return_key_type_set/get edje_object_part_text_input_panel_return_key_disabled_set/get + +2012-02-20 WooHyun Jung + + * Change API names from edje_object_markup_filter_callback_{add,del,del_full}. + to edje_object_text_markup_filter_callback_{add,del,del_full}. diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h index d389eac0b9..2aa8a05131 100644 --- a/legacy/edje/src/lib/Edje.h +++ b/legacy/edje/src/lib/Edje.h @@ -3096,17 +3096,17 @@ EAPI Eina_Bool edje_object_part_text_input_panel_return_key_disabled_get( * @warning This function will be deprecated because of difficulty in use. * The type(format, text, or makrup) of text should be always * checked in the filter function for correct filtering. - * Please use edje_object_markup_filter_callback_add() instead. There + * Please use edje_object_text_markup_filter_callback_add() instead. There * is no need to check the type of text in the filter function * because the text is always markup. * @warning If you use this function with - * edje_object_markup_filter_callback_add() togehter, all + * edje_object_text_markup_filter_callback_add() togehter, all * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions * will be executed, and then filtered text will be inserted. * * @see edje_object_text_insert_filter_callback_del * @see edje_object_text_insert_filter_callback_del_full - * @see edje_object_markup_filter_callback_add + * @see edje_object_text_markup_filter_callback_add * * @param obj A valid Evas_Object handle * @param part The part name @@ -3172,8 +3172,8 @@ EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Ob * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions * will be executed, and then filtered text will be inserted. * - * @see edje_object_markup_filter_callback_del - * @see edje_object_markup_filter_callback_del_full + * @see edje_object_text_markup_filter_callback_del + * @see edje_object_text_markup_filter_callback_del_full * @see edje_object_text_insert_filter_callback_add * * @param obj A valid Evas_Object handle @@ -3182,7 +3182,7 @@ EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Ob * @param data User provided data to pass to the filter function * @since 1.2.0 */ -EAPI void edje_object_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data); +EAPI void edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data); /** * Delete a function from the markup filter list. @@ -3190,8 +3190,8 @@ EAPI void edje_object_markup_filter_callback_add(Evas_Object *obj, const char *p * Delete the given @p func filter from the list in @p part. Returns * the user data pointer given when added. * - * @see edje_object_markup_filter_callback_add - * @see edje_object_markup_filter_callback_del_full + * @see edje_object_text_markup_filter_callback_add + * @see edje_object_text_markup_filter_callback_del_full * * @param obj A valid Evas_Object handle * @param part The part name @@ -3200,7 +3200,7 @@ EAPI void edje_object_markup_filter_callback_add(Evas_Object *obj, const char *p * @return The user data pointer if succesful, or NULL otherwise * @since 1.2.0 */ -EAPI void *edje_object_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func); +EAPI void *edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func); /** * Delete a function and matching user data from the markup filter list. @@ -3209,8 +3209,8 @@ EAPI void *edje_object_markup_filter_callback_del(Evas_Object *obj, const char * * in @p part. * Returns the user data pointer given when added. * - * @see edje_object_markup_filter_callback_add - * @see edje_object_markup_filter_callback_del + * @see edje_object_text_markup_filter_callback_add + * @see edje_object_text_markup_filter_callback_del * * @param obj A valid Evas_Object handle * @param part The part name @@ -3220,7 +3220,7 @@ EAPI void *edje_object_markup_filter_callback_del(Evas_Object *obj, const char * * @return The same data pointer if succesful, or NULL otherwise * @since 1.2.0 */ -EAPI void *edje_object_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data); +EAPI void *edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data); /** * @brief Swallows an object into the edje. diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index 1f30d71a07..6750b5b831 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -2150,7 +2150,7 @@ edje_object_text_insert_filter_callback_del_full(Evas_Object *obj, const char *p } EAPI void -edje_object_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data) +edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data) { Edje *ed; Edje_Markup_Filter_Callback *cb; @@ -2166,7 +2166,7 @@ edje_object_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_ } EAPI void * -edje_object_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func) +edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func) { Edje *ed; Edje_Markup_Filter_Callback *cb; @@ -2190,7 +2190,7 @@ edje_object_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_ } EAPI void * -edje_object_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data) +edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data) { Edje *ed; Edje_Markup_Filter_Callback *cb;