summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--efl/dbus_mainloop/e_dbus.c19
-rw-r--r--efl/dbus_mainloop/e_dbus.h7
2 files changed, 0 insertions, 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 *
316e_dbus_connection_new(DBusConnection *conn) 316e_dbus_connection_new(DBusConnection *conn)
317{ 317{
318 E_DBus_Connection *cd; 318 E_DBus_Connection *cd;
319 const char *conn_name;
320 319
321 cd = calloc(1, sizeof(E_DBus_Connection)); 320 cd = calloc(1, sizeof(E_DBus_Connection));
322 if (!cd) return NULL; 321 if (!cd) return NULL;
323
324 cd->conn = conn; 322 cd->conn = conn;
325 conn_name = dbus_bus_get_unique_name(conn);
326 if (conn_name)
327 {
328 DBG("Connected! Name: %s", conn_name);
329 cd->conn_name = strdup(conn_name);
330 }
331 else
332 DBG("Not connected");
333
334 cd->shared_type = (unsigned int)-1;
335 cd->fd_handlers = NULL;
336 cd->timeouts = NULL;
337 323
338 return cd; 324 return cd;
339} 325}
@@ -352,11 +338,6 @@ e_dbus_connection_free(void *data)
352 EINA_LIST_FREE(cd->timeouts, timer) 338 EINA_LIST_FREE(cd->timeouts, timer)
353 ecore_timer_del(timer); 339 ecore_timer_del(timer);
354 340
355 // if (cd->shared_type != (unsigned int)-1)
356 // shared_connections[cd->shared_type] = NULL;
357
358 if (cd->conn_name) free(cd->conn_name);
359
360 if (cd->idler) ecore_idler_del(cd->idler); 341 if (cd->idler) ecore_idler_del(cd->idler);
361 342
362 free(cd); 343 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;
31 31
32struct E_DBus_Connection 32struct E_DBus_Connection
33{ 33{
34 DBusBusType shared_type;
35 DBusConnection *conn; 34 DBusConnection *conn;
36 char *conn_name;
37
38 Eina_List *fd_handlers; 35 Eina_List *fd_handlers;
39 Eina_List *timeouts; 36 Eina_List *timeouts;
40 Eina_List *signal_handlers;
41 void (*signal_dispatcher)(E_DBus_Connection *conn, DBusMessage *msg);
42
43 Ecore_Idler *idler; 37 Ecore_Idler *idler;
44
45 int refcount; 38 int refcount;
46}; 39};
47 40