Remove all usage of the Remember network property

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index cb24662..e09bdca 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -37,8 +37,6 @@ struct connman_network {
        connman_bool_t secondary;
        connman_bool_t available;
        connman_bool_t connected;
-       connman_bool_t remember;
-       connman_uint8_t priority;
        connman_uint8_t strength;
        char *identifier;
        char *address;
@@ -124,10 +122,6 @@ static DBusMessage *get_properties(DBusConnection *conn,
        connman_dbus_dict_append_variant(&dict, "Connected",
                                DBUS_TYPE_BOOLEAN, &network->connected);
 
-       if (network->priority > 0)
-               connman_dbus_dict_append_variant(&dict, "Priority",
-                                       DBUS_TYPE_BYTE, &network->priority);
-
        if (network->strength > 0)
                connman_dbus_dict_append_variant(&dict, "Strength",
                                        DBUS_TYPE_BYTE, &network->strength);
@@ -193,15 +187,6 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                g_free(network->wifi.passphrase);
                network->wifi.passphrase = g_strdup(passphrase);
-       } else if (g_str_equal(name, "Priority") == TRUE) {
-               connman_uint8_t priority;
-
-               if (type != DBUS_TYPE_BYTE)
-                       return __connman_error_invalid_arguments(msg);
-
-               dbus_message_iter_get_basic(&value, &priority);
-
-               network->priority = priority;
        }
 
        __connman_storage_save_network(network);
@@ -778,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
  *
@@ -919,9 +873,7 @@ int connman_network_set_uint8(struct connman_network *network,
 {
        DBG("network %p key %s value %d", network, key, value);
 
-       if (g_str_equal(key, "Priority") == TRUE)
-               network->priority = value;
-       else if (g_str_equal(key, "Strength") == TRUE)
+       if (g_str_equal(key, "Strength") == TRUE)
                network->strength = value;
 
        return connman_element_set_uint8(&network->element, key, value);
@@ -939,9 +891,7 @@ connman_uint8_t connman_network_get_uint8(struct connman_network *network,
 {
        DBG("network %p key %s", network, key);
 
-       if (g_str_equal(key, "Priority") == TRUE)
-               return network->priority;
-       else if (g_str_equal(key, "Strength") == TRUE)
+       if (g_str_equal(key, "Strength") == TRUE)
                return network->strength;
 
        return connman_element_get_uint8(&network->element, key);