From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 15 May 2009 07:53:34 +0000 (-0700)
Subject: Disconnect service on removal if still connected
X-Git-Tag: 0.19~1
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=050811a6aa9fcfe1885e90694eeeebc2ee0fd071;hp=820d76eb0f2abbf834b88c545fa72aada0829b7e;p=connman

Disconnect service on removal if still connected
---

diff --git a/src/service.c b/src/service.c
index 789cc9d..48bb49c 100644
--- a/src/service.c
+++ b/src/service.c
@@ -415,15 +415,8 @@ static DBusMessage *remove_service(DBusConnection *conn,
 	if (service->favorite == FALSE)
 		return __connman_error_not_supported(msg);
 
-	if (service->network != NULL) {
-		struct connman_device *device;
-
-		device = connman_network_get_device(service->network);
-		if (device != NULL)
-			__connman_device_disconnect(device);
-
+	if (service->network != NULL)
 		__connman_network_disconnect(service->network);
-	}
 
 	connman_service_set_favorite(service, FALSE);
 	__connman_storage_save_service(service);