summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-03-14 19:47:43 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-03-14 19:47:43 +0000
commit6668f2517d3cc74a6bb3e70773d3fa15b679484c (patch)
tree6610b1161299e5aecec5ec06b24b359ce0ec8864
parentd3b161cefcb2759c2c8a2fee00ee9f51ca84371b (diff)
Fix calling of agent release function
-rw-r--r--hcid/agent.c5
-rw-r--r--hcid/agent.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/hcid/agent.c b/hcid/agent.c
index fa7b3984..2dab62e5 100644
--- a/hcid/agent.c
+++ b/hcid/agent.c
@@ -86,7 +86,6 @@ struct agent_request {
static DBusConnection *connection = NULL;
-static void release_agent(struct agent *agent);
static void send_cancel_request(struct agent_request *req);
static void agent_free(struct agent *agent)
@@ -112,7 +111,7 @@ static void agent_free(struct agent *agent)
g_source_remove(agent->timeout);
if (!agent->exited)
- release_agent(agent);
+ agent_release(agent);
g_free(agent->name);
g_free(agent->path);
@@ -550,7 +549,7 @@ static void send_cancel_request(struct agent_request *req)
agent_request_free(req);
}
-void release_agent(struct agent *agent)
+void agent_release(struct agent *agent)
{
DBusMessage *message;
diff --git a/hcid/agent.h b/hcid/agent.h
index 8f26f37c..bfbce0b1 100644
--- a/hcid/agent.h
+++ b/hcid/agent.h
@@ -49,7 +49,7 @@ int agent_confirm(struct agent *agent, const char *device, const char *pin,
int agent_cancel(struct agent *agent);
-int agent_release(struct agent *agent);
+void agent_release(struct agent *agent);
gboolean agent_matches(struct agent *agent, const char *name, const char *path);