From 3544e7408f7675b5c0618f4e43b725fc592f1978 Mon Sep 17 00:00:00 2001 From: davemds Date: Sat, 23 Aug 2014 20:42:19 +0200 Subject: [PATCH] Cleanup, remove unused stuff --- efl/dbus_mainloop/e_dbus.c | 19 ------------------- efl/dbus_mainloop/e_dbus.h | 7 ------- 2 files changed, 26 deletions(-) diff --git a/efl/dbus_mainloop/e_dbus.c b/efl/dbus_mainloop/e_dbus.c index 20875ba..f0388d2 100644 --- a/efl/dbus_mainloop/e_dbus.c +++ b/efl/dbus_mainloop/e_dbus.c @@ -316,24 +316,10 @@ static E_DBus_Connection * e_dbus_connection_new(DBusConnection *conn) { E_DBus_Connection *cd; - const char *conn_name; cd = calloc(1, sizeof(E_DBus_Connection)); if (!cd) return NULL; - cd->conn = conn; - conn_name = dbus_bus_get_unique_name(conn); - if (conn_name) - { - DBG("Connected! Name: %s", conn_name); - cd->conn_name = strdup(conn_name); - } - else - DBG("Not connected"); - - cd->shared_type = (unsigned int)-1; - cd->fd_handlers = NULL; - cd->timeouts = NULL; return cd; } @@ -352,11 +338,6 @@ e_dbus_connection_free(void *data) EINA_LIST_FREE(cd->timeouts, timer) ecore_timer_del(timer); - // if (cd->shared_type != (unsigned int)-1) - // shared_connections[cd->shared_type] = NULL; - - if (cd->conn_name) free(cd->conn_name); - if (cd->idler) ecore_idler_del(cd->idler); free(cd); diff --git a/efl/dbus_mainloop/e_dbus.h b/efl/dbus_mainloop/e_dbus.h index 7b4939a..f5bb786 100644 --- a/efl/dbus_mainloop/e_dbus.h +++ b/efl/dbus_mainloop/e_dbus.h @@ -31,17 +31,10 @@ typedef struct E_DBus_Timeout_Data E_DBus_Timeout_Data; struct E_DBus_Connection { - DBusBusType shared_type; DBusConnection *conn; - char *conn_name; - Eina_List *fd_handlers; Eina_List *timeouts; - Eina_List *signal_handlers; - void (*signal_dispatcher)(E_DBus_Connection *conn, DBusMessage *msg); - Ecore_Idler *idler; - int refcount; };