diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-01-05 15:19:10 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-01-05 15:19:10 -0800 |
| commit | a67c35315c778128c0554b3f257c6f36fb7fda46 (patch) | |
| tree | 360ebe0b52144cfdfa06cbf85b265a174e1e42df /plugins/neard.c | |
| parent | a5cd87ca29936f764a05f2897577e9e322e872b8 (diff) | |
| download | bluez-a67c35315c778128c0554b3f257c6f36fb7fda46.tar.gz | |
plugins: Use btd_adapter_get_default instead of adapter_get_default
Diffstat (limited to 'plugins/neard.c')
| -rw-r--r-- | plugins/neard.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/neard.c b/plugins/neard.c index df4382f80..4d52e077d 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -618,7 +618,8 @@ static DBusMessage *push_oob(DBusConnection *conn, DBusMessage *msg, void *data) DBG(""); - adapter = adapter_get_default(); + adapter = btd_adapter_get_default(); + err = check_adapter(adapter); if (err < 0) return error_reply(msg, -err); @@ -662,7 +663,8 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg, DBG(""); - adapter = adapter_get_default(); + adapter = btd_adapter_get_default(); + err = check_adapter(adapter); if (err < 0) return error_reply(msg, -err); @@ -726,7 +728,8 @@ 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 = adapter_get_default(); + adapter = btd_adapter_get_default(); + if (adapter && btd_adapter_check_oob_handler(adapter)) agent_register_postpone = TRUE; else |