E SVN: tasn IN trunk/PROTO/eobj: examples/composite_objects examples/evas examples/signals lib

[Enlightenment S. <no-...@en...>]

Log:
Eobj: Added EOBJ_CALLBACK_STOP/CONTINUE macros.

Author:       tasn
Date:         2012-04-23 01:09:58 -0700 (Mon, 23 Apr 2012)
New Revision: 70408
Trac:         http://trac.enlightenment.org/e/changeset/70408

Modified:
  trunk/PROTO/eobj/examples/composite_objects/main.c trunk/PROTO/eobj/examples/evas/test.c trunk/PROTO/eobj/examples/signals/simple.c trunk/PROTO/eobj/lib/Eobj.h trunk/PROTO/eobj/lib/eobj.c 

Modified: trunk/PROTO/eobj/examples/composite_objects/main.c
===================================================================
--- trunk/PROTO/eobj/examples/composite_objects/main.c	2012-04-23 08:09:54 UTC (rev 70407)
+++ trunk/PROTO/eobj/examples/composite_objects/main.c	2012-04-23 08:09:58 UTC (rev 70408)
@@ -16,7 +16,7 @@
 
    cb_called = EINA_TRUE;
 
-   return EINA_TRUE;
+   return EOBJ_CALLBACK_CONTINUE;
 }
 
 int

Modified: trunk/PROTO/eobj/examples/evas/test.c
===================================================================
--- trunk/PROTO/eobj/examples/evas/test.c	2012-04-23 08:09:54 UTC (rev 70407)
+++ trunk/PROTO/eobj/examples/evas/test.c	2012-04-23 08:09:58 UTC (rev 70408)
@@ -14,7 +14,7 @@
    const Eobj_Class *klass = eobj_class_get(obj);
    printf("%s obj-type:'%s' data:'%s'\n", desc->name, eobj_class_name_get(klass), (const char *) data);
 
-   return EINA_TRUE;
+   return EOBJ_CALLBACK_CONTINUE;
 }
 
 int

Modified: trunk/PROTO/eobj/examples/signals/simple.c
===================================================================
--- trunk/PROTO/eobj/examples/signals/simple.c	2012-04-23 08:09:54 UTC (rev 70407)
+++ trunk/PROTO/eobj/examples/signals/simple.c	2012-04-23 08:09:58 UTC (rev 70408)
@@ -42,7 +42,7 @@
    pd->cb_count++;
 
    printf("Added SIG_A_CHANGED callback to %p. Count: %d\n", obj, pd->cb_count);
-   return EINA_TRUE;
+   return EOBJ_CALLBACK_CONTINUE;
 }
 
 Eina_Bool
@@ -59,7 +59,7 @@
    pd->cb_count--;
 
    printf("Removed SIG_A_CHANGED callback from %p. Count: %d\n", obj, pd->cb_count);
-   return EINA_TRUE;
+   return EOBJ_CALLBACK_CONTINUE;
 }
 
 static void

Modified: trunk/PROTO/eobj/lib/Eobj.h
===================================================================
--- trunk/PROTO/eobj/lib/Eobj.h	2012-04-23 08:09:54 UTC (rev 70407)
+++ trunk/PROTO/eobj/lib/Eobj.h	2012-04-23 08:09:58 UTC (rev 70408)
@@ -626,6 +626,20 @@
 typedef short Eobj_Callback_Priority;
 
 /**
+ * @def EOBJ_CALLBACK_STOP
+ * Stop calling callbacks for the even of which the callback was called for.
+ * @see EOBJ_CALLBACK_CONTINUE
+ */
+#define EOBJ_CALLBACK_STOP EINA_FALSE
+
+/**
+ * @def EOBJ_CALLBACK_CONTINUE
+ * Continue calling callbacks for the even of which the callback was called for.
+ * @see EOBJ_CALLBACK_STOP
+ */
+#define EOBJ_CALLBACK_CONTINUE EINA_TRUE
+
+/**
  * @typedef Eobj_Event_Cb
  *
  * An event callback prototype.
@@ -634,7 +648,7 @@
  * @param obj The object which initiated the event.
  * @param desc The event's description.
  * @param event_info additional data passed with the event.
- * @return #EINA_FALSE to stop calling additional callbacks for the event, #EINA_TRUE to continue.
+ * @return #EOBJ_CALLBACK_STOP to stop calling additional callbacks for the event, #EOBJ_CALLBACK_CONTINUE to continue.
  */
 typedef Eina_Bool (*Eobj_Event_Cb)(void *data, Eobj *obj, const Eobj_Event_Description *desc, void *event_info);
 

Modified: trunk/PROTO/eobj/lib/eobj.c
===================================================================
--- trunk/PROTO/eobj/lib/eobj.c	2012-04-23 08:09:54 UTC (rev 70407)
+++ trunk/PROTO/eobj/lib/eobj.c	2012-04-23 08:09:58 UTC (rev 70408)
@@ -1031,7 +1031,7 @@
    Eobj_Weak_Ref *wref = data;
    wref->obj = NULL;
 
-   return EINA_TRUE;
+   return EOBJ_CALLBACK_CONTINUE;
 }
 
 EAPI Eobj_Weak_Ref *