Diff between 4cb7c10de18967660641bcba93fe24130255519d and 143c325fa48ac67c3de65b544b85c078fdc152c7

Changed Files

File Additions Deletions Status
plugins/neard.c +3 -4 modified

Full Patch

diff --git a/plugins/neard.c b/plugins/neard.c
index 02c3403..c8acb04 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -36,7 +36,6 @@
 #include "log.h"
 #include "dbus-common.h"
 #include "adapter.h"
-#include "manager.h"
 #include "device.h"
 #include "eir.h"
 #include "agent.h"
@@ -619,7 +618,7 @@ static DBusMessage *push_oob(DBusConnection *conn, DBusMessage *msg, void *data)
 
 	DBG("");
 
-	adapter = manager_get_default_adapter();
+	adapter = adapter_get_default();
 	err = check_adapter(adapter);
 	if (err < 0)
 		return error_reply(msg, -err);
@@ -663,7 +662,7 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg,
 
 	DBG("");
 
-	adapter = manager_get_default_adapter();
+	adapter = adapter_get_default();
 	err = check_adapter(adapter);
 	if (err < 0)
 		return error_reply(msg, -err);
@@ -727,7 +726,7 @@ static void neard_appeared(DBusConnection *conn, void *user_data)
 	 * due to neard crash or release before action was completed, postpone
 	 * register until action is finished.
 	 */
-	adapter = manager_get_default_adapter();
+	adapter = adapter_get_default();
 	if (adapter && btd_adapter_check_oob_handler(adapter))
 		agent_register_postpone = TRUE;
 	else