diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-01-03 14:15:37 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-01-03 14:15:37 +0200 |
| commit | 143c325fa48ac67c3de65b544b85c078fdc152c7 (patch) | |
| tree | 000d9f76d1d8c97d02b52ff9fd56087cf9de72e1 /plugins/neard.c | |
| parent | 4cb7c10de18967660641bcba93fe24130255519d (diff) | |
| download | bluez-143c325fa48ac67c3de65b544b85c078fdc152c7.tar.gz | |
neard: Prefer adapter_get_default() over manager function
Diffstat (limited to 'plugins/neard.c')
| -rw-r--r-- | plugins/neard.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/neard.c b/plugins/neard.c index 02c340397..c8acb0479 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 |