X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fagent.c;h=5ae62b23137e3ba5c4994ddda6823a942966f946;hb=a922337a31fab30b2f6af5dd96efb9cb338169fb;hp=4765868d535e59469b031bf9c58fc711fa9a17d2;hpb=99983be83b0f1c0ecbce00276fd21ba05b4d681f;p=connman

diff --git a/src/agent.c b/src/agent.c
index 4765868..5ae62b2 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -47,13 +47,11 @@ static void agent_free(void)
 	agent_path = NULL;
 }
 
-static gboolean agent_disconnect(void *data)
+static void agent_disconnect(DBusConnection *connection, void *data)
 {
 	DBG("data %p", data);
 
 	agent_free();
-
-	return TRUE;
 }
 
 int __connman_agent_register(const char *sender, const char *path)
@@ -107,8 +105,13 @@ void __connman_agent_cleanup(void)
 	if (agent_watch > 0)
 		g_dbus_remove_watch(connection, agent_watch);
 
+	if (agent_path == NULL)
+		return;
+
 	msg = dbus_message_new_method_call(agent_sender, agent_path,
 					CONNMAN_AGENT_INTERFACE, "Release");
+	if (msg == NULL)
+		return;
 
 	dbus_message_set_no_reply(msg, TRUE);