summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-22 19:32:22 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-24 11:04:58 +0900
commite7abfba03404bb8b594855ec712c9242ca9656eb (patch)
treec41294ebbb95dcdd1c1070b2a9b3b62b01700f66
parentdf4e8653c7b6f30925ad3c852160bba9002ec4d2 (diff)
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? :)
-rw-r--r--src/lib/edje/edje_message_queue.c16
-rw-r--r--src/lib/edje/edje_private.h1
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 75bde8381d..7dfc062bfa 100644
--- a/src/lib/edje/edje_message_queue.c
+++ b/src/lib/edje/edje_message_queue.c
@@ -1,6 +1,6 @@
1#include "edje_private.h" 1#include "edje_private.h"
2 2
3static void _edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg, Eina_Bool prop); 3static void _edje_message_propagate_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop);
4 4
5static int _injob = 0; 5static int _injob = 0;
6static Ecore_Job *_job = NULL; 6static Ecore_Job *_job = NULL;
@@ -16,7 +16,7 @@ static int tmp_msgq_restart = 0;
16*============================================================================*/ 16*============================================================================*/
17 17
18static void 18static void
19_edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg, Eina_Bool prop) 19_edje_object_message_propagate_send(Evas_Object *obj, Edje_Message_Type type, int id, void *msg, Eina_Bool prop)
20{ 20{
21 Edje *ed; 21 Edje *ed;
22 Eina_List *l; 22 Eina_List *l;
@@ -24,10 +24,10 @@ _edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int
24 24
25 ed = _edje_fetch(obj); 25 ed = _edje_fetch(obj);
26 if (!ed) return; 26 if (!ed) return;
27 _edje_message_propornot_send(ed, EDJE_QUEUE_SCRIPT, type, id, msg, prop); 27 _edje_message_propagate_send(ed, EDJE_QUEUE_SCRIPT, type, id, msg, prop);
28 EINA_LIST_FOREACH(ed->subobjs, l, o) 28 EINA_LIST_FOREACH(ed->subobjs, l, o)
29 { 29 {
30 _edje_object_message_popornot_send(o, type, id, msg, EINA_TRUE); 30 _edje_object_message_propagate_send(o, type, id, msg, EINA_TRUE);
31 } 31 }
32} 32}
33 33
@@ -339,8 +339,8 @@ _edje_message_free(Edje_Message *em)
339 free(em); 339 free(em);
340} 340}
341 341
342void 342static void
343_edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop) 343_edje_message_propagate_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop)
344{ 344{
345 /* FIXME: check all malloc & strdup fails and gracefully unroll and exit */ 345 /* FIXME: check all malloc & strdup fails and gracefully unroll and exit */
346 Edje_Message *em; 346 Edje_Message *em;
@@ -530,7 +530,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
530void 530void
531_edje_util_message_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg) 531_edje_util_message_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg)
532{ 532{
533 _edje_message_propornot_send(ed, queue, type, id, emsg, EINA_FALSE); 533 _edje_message_propagate_send(ed, queue, type, id, emsg, EINA_FALSE);
534} 534}
535 535
536void 536void
@@ -880,7 +880,7 @@ _edje_message_del(Edje *ed)
880EAPI void 880EAPI void
881edje_object_message_send(Eo *obj, Edje_Message_Type type, int id, void *msg) 881edje_object_message_send(Eo *obj, Edje_Message_Type type, int id, void *msg)
882{ 882{
883 _edje_object_message_popornot_send(obj, type, id, msg, EINA_FALSE); 883 _edje_object_message_propagate_send(obj, type, id, msg, EINA_FALSE);
884} 884}
885 885
886EAPI void 886EAPI void
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 6b9da86bb4..34fae264c0 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2651,7 +2651,6 @@ void _edje_message_shutdown (void);
2651void _edje_message_cb_set (Edje *ed, void (*func) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg), void *data); 2651void _edje_message_cb_set (Edje *ed, void (*func) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg), void *data);
2652Edje_Message *_edje_message_new (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id); 2652Edje_Message *_edje_message_new (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id);
2653void _edje_message_free (Edje_Message *em); 2653void _edje_message_free (Edje_Message *em);
2654void _edje_message_propornot_send (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg, Eina_Bool prop);
2655void _edje_util_message_send (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg); 2654void _edje_util_message_send (Edje *ed, Edje_Queue queue, Edje_Message_Type type, int id, void *emsg);
2656void _edje_message_parameters_push (Edje_Message *em); 2655void _edje_message_parameters_push (Edje_Message *em);
2657void _edje_message_process (Edje_Message *em); 2656void _edje_message_process (Edje_Message *em);