From 61ca9d550d705ea21afbe88a0af3e3cba2515314 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Mon, 18 Mar 2013 10:27:14 -0300 Subject: [PATCH] Revert "Add a new API to edbus to let it create an EDbus session from" This reverts commit 8ecd30d578ebac46bbdf5f6d5c0b7cad1187f84f. First of all, if it's not tested it shouldn't be committed. Seriously, test your stuff before committing, particularly when you *add* an API. If it slips in and we forget it there, once it's released we can no longer remove it. Second, EDBus is a complete wrapper over libdbus and is in our intention to remove libdbus when the EDBus implements the wire protocol itself. Therefore there's no point in adding a public function to create an EDBus_Connection from a DBusConnection, even if it's passed as a void pointer. --- src/lib/edbus/edbus_connection.h | 11 ----------- src/lib/edbus/edbus_core.c | 28 ---------------------------- 2 files changed, 39 deletions(-) diff --git a/src/lib/edbus/edbus_connection.h b/src/lib/edbus/edbus_connection.h index 72152321c9..5573f204a4 100644 --- a/src/lib/edbus/edbus_connection.h +++ b/src/lib/edbus/edbus_connection.h @@ -58,17 +58,6 @@ EAPI EDBus_Connection *edbus_connection_ref(EDBus_Connection *conn) EINA_ARG_NON */ EAPI void edbus_connection_unref(EDBus_Connection *conn) EINA_ARG_NONNULL(1); -/** - * Integrate an existing DBus connection with the ecore main loop - * - * @param type - type of bus - * @param conn - a dbus connection (must be a DBusConnection *) - * - * @note this is a low-level function, it is meant to be used by language - * bindings, don't use unless you know what are you doing! - */ -EAPI EDBus_Connection *edbus_connection_from_dbus_connection(EDBus_Connection_Type type, void *conn); - /** * @brief Add a callback function to be called when connection is freed * diff --git a/src/lib/edbus/edbus_core.c b/src/lib/edbus/edbus_core.c index 55339f5f03..ccae5773b8 100644 --- a/src/lib/edbus/edbus_core.c +++ b/src/lib/edbus/edbus_core.c @@ -976,34 +976,6 @@ _connection_get(EDBus_Connection_Type type) return conn; } -EAPI EDBus_Connection * -edbus_connection_from_dbus_connection(EDBus_Connection_Type type, void *conn) -{ - EDBus_Connection *econn; - EDBus_Object *obj; - - EINA_SAFETY_ON_FALSE_RETURN_VAL((type < EDBUS_CONNECTION_TYPE_LAST) && - (type > EDBUS_CONNECTION_TYPE_UNKNOWN), NULL); - - econn = calloc(1, sizeof(EDBus_Connection)); - EINA_SAFETY_ON_NULL_RETURN_VAL(econn, NULL); - - econn->dbus_conn = (DBusConnection*) conn; - edbus_connection_setup(econn); - econn->type = type; - econn->refcount = 1; - EINA_MAGIC_SET(econn, EDBUS_CONNECTION_MAGIC); - econn->names = eina_hash_string_superfast_new(NULL); - - edbus_signal_handler_add(econn, NULL, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, - "Disconnected", _disconnected, econn); - obj = edbus_object_get(econn, EDBUS_FDO_BUS, EDBUS_FDO_PATH); - econn->fdo_proxy = edbus_proxy_get(obj, EDBUS_FDO_INTERFACE); - - DBG("Attached to connection at %p", conn); - return econn; -} - EAPI EDBus_Connection * edbus_private_connection_get(EDBus_Connection_Type type) {