summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-07-17 17:37:27 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-07-17 17:37:27 +0200
commit2395f8888cd08a6c2c7efaa080c4c5eb0723b09d (patch)
tree9cb8ffa5ca9d9d9e4234a0210d8cc6c89172fa56
parent99e3256f6569fba111623e8131afa6f7e1ab539e (diff)
downloadconnman-2395f8888cd08a6c2c7efaa080c4c5eb0723b09d.tar.gz
connman-2395f8888cd08a6c2c7efaa080c4c5eb0723b09d.tar.bz2
connman-2395f8888cd08a6c2c7efaa080c4c5eb0723b09d.zip
Remove timeout when service connect is stopped via disconnect
-rw-r--r--src/service.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/service.c b/src/service.c
index c090bfbf..e334deee 100644
--- a/src/service.c
+++ b/src/service.c
@@ -593,6 +593,11 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
if (service->pending != NULL) {
DBusMessage *reply;
+ if (service->timeout > 0) {
+ g_source_remove(service->timeout);
+ service->timeout = 0;
+ }
+
reply = __connman_error_operation_aborted(service->pending);
if (reply != NULL)
g_dbus_send_message(conn, reply);