network: Export connman_network_get_connecting() to plugins

diff --git a/include/network.h b/include/network.h
index d898531..a673703 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -77,6 +77,7 @@ void connman_network_set_group(struct connman_network *network,
                                                const char *group);
 const char *connman_network_get_group(struct connman_network *network);
 
+connman_bool_t connman_network_get_connecting(struct connman_network *network);
 int connman_network_set_available(struct connman_network *network,
                                                connman_bool_t available);
 connman_bool_t connman_network_get_available(struct connman_network *network);

diff --git a/src/connman.h b/src/connman.h
index 437eaed..42bf2e6 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -399,7 +399,6 @@ const char *__connman_network_get_type(struct connman_network *network);
 const char *__connman_network_get_group(struct connman_network *network);
 const char *__connman_network_get_ident(struct connman_network *network);
 connman_bool_t __connman_network_get_weakness(struct connman_network *network);
-connman_bool_t __connman_network_get_connecting(struct connman_network *network);
 
 int __connman_config_init();
 void __connman_config_cleanup(void);

diff --git a/src/device.c b/src/device.c
index 4822fa0..9644670 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -787,7 +787,7 @@ int __connman_device_disconnect(struct connman_device *device)
        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
                struct connman_network *network = value;
 
-               if (__connman_network_get_connecting(network) == TRUE) {
+               if (connman_network_get_connecting(network) == TRUE) {
                        /*
                         * Skip network in the process of connecting.
                         * This is a workaround for WiFi networks serviced

diff --git a/src/network.c b/src/network.c
index 77b5889..f3282dc 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -438,7 +438,7 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network)
        return FALSE;
 }
 
-connman_bool_t __connman_network_get_connecting(struct connman_network *network)
+connman_bool_t connman_network_get_connecting(struct connman_network *network)
 {
        return network->connecting;
 }

diff --git a/src/service.c b/src/service.c
index c95c96b..ece29fd 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -428,8 +428,7 @@ static connman_bool_t is_connecting_state(struct connman_service *service,
        case CONNMAN_SERVICE_STATE_IDLE:
        case CONNMAN_SERVICE_STATE_FAILURE:
                if (service->network != NULL)
-                       return __connman_network_get_connecting(
-                                                       service->network);
+                       return connman_network_get_connecting(service->network);
        case CONNMAN_SERVICE_STATE_DISCONNECT:
        case CONNMAN_SERVICE_STATE_READY:
        case CONNMAN_SERVICE_STATE_ONLINE: