summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-05-17 05:52:32 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-05-17 05:52:32 -0700
commit2f91f80f19788f0e1734c586dbadb399d03940b5 (patch)
treeb69442cccccc0eaadff4538f6a88ed069730d14f
parent18c66d12aa9cd485d47521944d1e731810fa3207 (diff)
downloadconnman-2f91f80f19788f0e1734c586dbadb399d03940b5.tar.gz
connman-2f91f80f19788f0e1734c586dbadb399d03940b5.tar.bz2
connman-2f91f80f19788f0e1734c586dbadb399d03940b5.zip
Remove all usage of the Remember network property
-rw-r--r--include/network.h3
-rw-r--r--src/device.c18
-rw-r--r--src/network.c32
3 files changed, 0 insertions, 53 deletions
diff --git a/include/network.h b/include/network.h
index cd00db7d..dd2c3859 100644
--- a/include/network.h
+++ b/include/network.h
@@ -79,9 +79,6 @@ extern int connman_network_set_associating(struct connman_network *network,
extern int connman_network_set_connected(struct connman_network *network,
connman_bool_t connected);
extern connman_bool_t connman_network_get_connected(struct connman_network *network);
-extern int connman_network_set_remember(struct connman_network *network,
- connman_bool_t remember);
-extern connman_bool_t connman_network_get_remember(struct connman_network *network);
extern int connman_network_connect(struct connman_network *network);
diff --git a/src/device.c b/src/device.c
index 3d15d775..ff519434 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1368,7 +1368,6 @@ static void connect_known_network(struct connman_device *device)
g_hash_table_iter_init(&iter, device->networks);
while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
- connman_uint8_t old_priority, new_priority;
connman_uint8_t old_strength, new_strength;
const char *name;
@@ -1386,25 +1385,11 @@ static void connect_known_network(struct connman_device *device)
}
}
- if (connman_network_get_remember(value) == FALSE)
- continue;
-
if (network == NULL) {
network = value;
continue;
}
- old_priority = connman_network_get_uint8(network,
- CONNMAN_PROPERTY_ID_PRIORITY);
- new_priority = connman_network_get_uint8(value,
- CONNMAN_PROPERTY_ID_PRIORITY);
-
- if (new_priority != old_priority) {
- if (new_priority > old_priority)
- network = value;
- continue;
- }
-
old_strength = connman_network_get_uint8(network,
CONNMAN_PROPERTY_ID_STRENGTH);
new_strength = connman_network_get_uint8(value,
@@ -1448,9 +1433,6 @@ static gboolean remove_unavailable_network(gpointer key, gpointer value,
if (connman_network_get_connected(network) == TRUE)
return FALSE;
- if (connman_network_get_remember(network) == TRUE)
- return FALSE;
-
if (connman_network_get_available(network) == TRUE)
return FALSE;
diff --git a/src/network.c b/src/network.c
index 8c5bdf35..e09bdcad 100644
--- a/src/network.c
+++ b/src/network.c
@@ -37,7 +37,6 @@ struct connman_network {
connman_bool_t secondary;
connman_bool_t available;
connman_bool_t connected;
- connman_bool_t remember;
connman_uint8_t strength;
char *identifier;
char *address;
@@ -764,37 +763,6 @@ connman_bool_t connman_network_get_connected(struct connman_network *network)
}
/**
- * connman_network_set_remember:
- * @network: network structure
- * @remember: remember state
- *
- * Change remember state of network (known networks)
- */
-int connman_network_set_remember(struct connman_network *network,
- connman_bool_t remember)
-{
- DBG("network %p remember %d", network, remember);
-
- if (network->remember == remember)
- return -EALREADY;
-
- network->remember = remember;
-
- return 0;
-}
-
-/**
- * connman_network_get_remember:
- * @network: network structure
- *
- * Get network remember setting
- */
-connman_bool_t connman_network_get_remember(struct connman_network *network)
-{
- return network->remember;
-}
-
-/**
* connman_network_connect:
* @network: network structure
*