diff options
| author | Henri Bragge <henri.bragge@ixonos.com> | 2011-03-01 17:20:25 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-02 16:23:47 +0100 |
| commit | 5a61086d5f73f15199f123d4090c0c24b91eed23 (patch) | |
| tree | 222df7c30880bf17d014f281d3f568b8a3e504ea /src | |
| parent | 363418508faaae1c3f9048e8165547384695230d (diff) | |
| download | connman-5a61086d5f73f15199f123d4090c0c24b91eed23.tar.gz connman-5a61086d5f73f15199f123d4090c0c24b91eed23.tar.bz2 connman-5a61086d5f73f15199f123d4090c0c24b91eed23.zip | |
network: Export connman_network_get_connecting() to plugins
Diffstat (limited to 'src')
| -rw-r--r-- | src/connman.h | 1 | ||||
| -rw-r--r-- | src/device.c | 2 | ||||
| -rw-r--r-- | src/network.c | 2 | ||||
| -rw-r--r-- | src/service.c | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/connman.h b/src/connman.h index 437eaed7..42bf2e61 100644 --- 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 4822fa05..9644670a 100644 --- 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 77b58897..f3282dcb 100644 --- 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 c95c96b3..ece29fd7 100644 --- 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: |