Cleanup, remove unused stuff
This commit is contained in:
parent
d0bea312ef
commit
3544e7408f
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue