Fix adapter removal.

1 files changed, 3 insertions, 15 deletions

diff --git a/src/manager.c b/src/manager.c
index 4f638566..cda45f4c 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -442,20 +442,14 @@ static void manager_remove_adapter(struct adapter *adapter)
 
 int manager_register_adapter(int id)
 {
-	struct adapter *adapter = adapter_create(id);
+	struct adapter *adapter = adapter_create(connection, id);
 	const gchar *path;
 
-	if(!adapter)
+	if (!adapter)
 		return -1;
 
 	path = adapter_get_path(adapter);
 
-	if (!adapter_init(connection, path, adapter)) {
-		error("Adapter interface init failed on path %s", path);
-		adapter_free(adapter);
-		return -1;
-	}
-
 	__probe_servers(path);
 
 	manager_add_adapter(adapter);
@@ -482,13 +476,7 @@ int manager_unregister_adapter(int id)
 
 	manager_remove_adapter(adapter);
 
-	if (!adapter_cleanup(connection, path)) {
-		error("Failed to unregister adapter interface on %s object",
-			path);
-		return -1;
-	}
-
-	adapter_free(adapter);
+	adapter_remove(adapter);
 
 	return 0;
 }