From 1956b12fa07621bf703c316c9386dc0c4fdd8a71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Tue, 11 Dec 2012 19:50:25 +0000 Subject: [PATCH] edbus: Remove unnecessary connection events MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by: José Roberto de Souza SVN revision: 80692 --- legacy/edbus/src/lib/edbus_connection.h | 21 --------------------- legacy/edbus/src/lib/edbus_core.c | 13 ------------- 2 files changed, 34 deletions(-) diff --git a/legacy/edbus/src/lib/edbus_connection.h b/legacy/edbus/src/lib/edbus_connection.h index 928b137..5cbf76d 100644 --- a/legacy/edbus/src/lib/edbus_connection.h +++ b/legacy/edbus/src/lib/edbus_connection.h @@ -100,31 +100,10 @@ EAPI void *edbus_connection_data_del(EDBus_Connection *conn, const c 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); /** diff --git a/legacy/edbus/src/lib/edbus_core.c b/legacy/edbus/src/lib/edbus_core.c index cfbba04..067422c 100644 --- a/legacy/edbus/src/lib/edbus_core.c +++ b/legacy/edbus/src/lib/edbus_core.c @@ -397,17 +397,11 @@ void 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 @@ void 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; } -- 2.7.4