jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e7abfba03404bb8b594855ec712c9242ca9656eb
commit e7abfba03404bb8b594855ec712c9242ca9656eb Author: Jean-Philippe Andre <[email protected]> Date: Mon May 22 19:32:22 2017 +0900 edje: Fix typos and overall strange function name popornot was supposed to be propornot which stands for prop or not. prop itself means propagate. Why choose a name so complicated? :) --- src/lib/edje/edje_message_queue.c | 16 ++++++++-------- src/lib/edje/edje_private.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/lib/edje/edje_message_queue.c b/src/lib/edje/edje_message_queue.c index 75bde83..7dfc062 100644 --- a/src/lib/edje/edje_message_queue.c +++ b/src/lib/edje/edje_message_queue.c @@ -1,6 +1,6 @@ #include "edje_private.h" -static void _edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg, Eina_Bool prop); +static void _edje_message_propagate_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop); static int _injob = 0; static Ecore_Job *_job = NULL; @@ -16,7 +16,7 @@ static int tmp_msgq_restart = 0; *============================================================================*/ static void -_edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg, Eina_Bool prop) +_edje_object_message_propagate_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg, Eina_Bool prop) { Edje *ed; Eina_List *l; @@ -24,10 +24,10 @@ _edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int ed = _edje_fetch(obj); if (!ed) return; - _edje_message_propornot_send(ed, EDJE_QUEUE_SCRIPT, type, id, msg, prop); + _edje_message_propagate_send(ed, EDJE_QUEUE_SCRIPT, type, id, msg, prop); EINA_LIST_FOREACH(ed->subobjs, l, o) { - _edje_object_message_popornot_send(o, type, id, msg, EINA_TRUE); + _edje_object_message_propagate_send(o, type, id, msg, EINA_TRUE); } } @@ -339,8 +339,8 @@ _edje_message_free(Edje_Message *em) free(em); } -void -_edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop) +static void +_edje_message_propagate_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop) { /* FIXME: check all malloc & strdup fails and gracefully unroll and exit */ Edje_Message *em; @@ -530,7 +530,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, void _edje_util_message_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg) { - _edje_message_propornot_send(ed, queue, type, id, emsg, EINA_FALSE); + _edje_message_propagate_send(ed, queue, type, id, emsg, EINA_FALSE); } void @@ -880,7 +880,7 @@ _edje_message_del(Edje *ed) EAPI void edje_object_message_send(Eo *obj, Edje_Message_Type type, int id, void *msg) { - _edje_object_message_popornot_send(obj, type, id, msg, EINA_FALSE); + _edje_object_message_propagate_send(obj, type, id, msg, EINA_FALSE); } EAPI void diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 6b9da86..34fae26 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -2651,7 +2651,6 @@ void _edje_message_shutdown (void); void _edje_message_cb_set (Edje *ed, void (*func) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg), void *data); Edje_Message *_edje_message_new (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id); void _edje_message_free (Edje_Message *em); -void _edje_message_propornot_send (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop); void _edje_util_message_send (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg); void _edje_message_parameters_push (Edje_Message *em); void _edje_message_process (Edje_Message *em); --
