Fix wrong service state handling on timeouts

diff --git a/src/service.c b/src/service.c
index 09d2534..7287c0d 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -698,29 +698,10 @@ static gboolean connect_timeout(gpointer user_data)
 
        service->timeout = 0;
 
-       if (service->network != NULL) {
-               connman_bool_t connected;
-
-               connected = connman_network_get_connected(service->network);
-               if (connected == TRUE) {
-                       __connman_service_indicate_state(service,
-                                               CONNMAN_SERVICE_STATE_READY);
-                       return FALSE;
-               }
-
+       if (service->network != NULL)
                __connman_network_disconnect(service->network);
-       } else if (service->device != NULL) {
-               connman_bool_t disconnected;
-
-               disconnected = connman_device_get_disconnected(service->device);
-               if (disconnected == FALSE) {
-                       __connman_service_indicate_state(service,
-                                               CONNMAN_SERVICE_STATE_READY);
-                       return FALSE;
-               }
-
+       else if (service->device != NULL)
                __connman_device_disconnect(service->device);
-       }
 
        if (service->pending != NULL) {
                DBusMessage *reply;