diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
| commit | 01761bea1ce6539b97640123660c67d81c54318b (patch) | |
| tree | a9eb2957891081a1ae111b6c7f53a8d2108597b2 /src/agent.c | |
| parent | 0019156df63264bdb80131f947833cd2a1293994 (diff) | |
| parent | 18614bd2b008cb9f3879990883c569c37b72f195 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/aloks-clone
Diffstat (limited to 'src/agent.c')
| -rw-r--r-- | src/agent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/agent.c b/src/agent.c index ae530f98..44ce3b11 100644 --- a/src/agent.c +++ b/src/agent.c @@ -60,7 +60,7 @@ typedef enum { } agent_request_type_t; struct agent { - struct adapter *adapter; + struct btd_adapter *adapter; char *name; char *path; uint8_t capability; @@ -190,7 +190,7 @@ static void agent_free(struct agent *agent) g_free(agent); } -struct agent *agent_create(struct adapter *adapter, const char *name, +struct agent *agent_create(struct btd_adapter *adapter, const char *name, const char *path, uint8_t capability, agent_remove_cb cb, void *remove_cb_data) { @@ -364,7 +364,7 @@ static void pincode_reply(DBusPendingCall *call, void *user_data) { struct agent_request *req = user_data; struct agent *agent = req->agent; - struct adapter *adapter = agent->adapter; + struct btd_adapter *adapter = agent->adapter; agent_pincode_cb cb = req->cb; DBusMessage *message; DBusError err; @@ -700,7 +700,7 @@ failed: static int request_fallback(struct agent_request *req, DBusPendingCallNotifyFunction function) { - struct adapter *adapter = req->agent->adapter; + struct btd_adapter *adapter = req->agent->adapter; struct agent *adapter_agent = adapter_get_agent(adapter); DBusMessage *msg; |