From: Enlightenment S. <no-...@en...> - 2012-12-11 19:50:32
|
Log: edbus: Remove unnecessary connection events Patch by: Jos?\195?\169 Roberto de Souza <zeh...@pr...> Author: lucas Date: 2012-12-11 11:50:25 -0800 (Tue, 11 Dec 2012) New Revision: 80692 Trac: http://trac.enlightenment.org/e/changeset/80692 Modified: trunk/edbus/src/lib/edbus_connection.h trunk/edbus/src/lib/edbus_core.c Modified: trunk/edbus/src/lib/edbus_connection.h =================================================================== --- trunk/edbus/src/lib/edbus_connection.h 2012-12-11 19:50:20 UTC (rev 80691) +++ trunk/edbus/src/lib/edbus_connection.h 2012-12-11 19:50:25 UTC (rev 80692) @@ -100,31 +100,10 @@ typedef enum { - EDBUS_CONNECTION_EVENT_OBJECT_ADDED = 0, - EDBUS_CONNECTION_EVENT_OBJECT_REMOVED, - //EDBUS_CONNECTION_EVENT_NAME_OWNER_CHANGED, EDBUS_CONNECTION_EVENT_DEL, EDBUS_CONNECTION_EVENT_LAST /**< sentinel, not a real event type */ } EDBus_Connection_Event_Type; -typedef struct _EDBus_Connection_Event_Object_Added -{ - const char *path; - EDBus_Object *object; -} EDBus_Connection_Event_Object_Added; - -typedef struct _EDBus_Connection_Event_Object_Removed -{ - const char *path; -} EDBus_Connection_Event_Object_Removed; - -typedef struct _EDBus_Connection_Event_Name_Owner_Changed -{ - const char *name; - const char *old_id; - const char *new_id; -} EDBus_Connection_Event_Name_Owner_Changed; - typedef void (*EDBus_Connection_Event_Cb)(void *data, EDBus_Connection *conn, void *event_info); /** Modified: trunk/edbus/src/lib/edbus_core.c =================================================================== --- trunk/edbus/src/lib/edbus_core.c 2012-12-11 19:50:20 UTC (rev 80691) +++ trunk/edbus/src/lib/edbus_core.c 2012-12-11 19:50:25 UTC (rev 80692) @@ -397,17 +397,11 @@ edbus_connection_name_object_del(EDBus_Connection *conn, const EDBus_Object *obj) { EDBus_Connection_Name *cn = eina_hash_find(conn->names, obj->name); - const EDBus_Connection_Event_Object_Removed ev = { - obj->path - }; if (!cn) return; if (!cn->objects) return; eina_hash_del(cn->objects, obj->path, obj); - _edbus_connection_event_callback_call - (conn, EDBUS_CONNECTION_EVENT_OBJECT_REMOVED, &ev); - edbus_connection_name_gc(conn, cn); } @@ -415,17 +409,10 @@ edbus_connection_name_object_set(EDBus_Connection *conn, EDBus_Object *obj) { EDBus_Connection_Name *cn; - const EDBus_Connection_Event_Object_Added ev = { - obj->path, - obj - }; cn = edbus_connection_name_get(conn, obj->name); eina_hash_add(cn->objects, obj->path, obj); - _edbus_connection_event_callback_call - (conn, EDBUS_CONNECTION_EVENT_OBJECT_ADDED, &ev); - return; } |