More simplification of property functions

[connman] / include / element.h

diff --git a/include/element.h b/include/element.h
index 30d9a11..5bd987b 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -38,20 +38,6 @@ extern "C" {
  * @short_description: Functions for handling elements
  */
 
-enum connman_element_state {
-       CONNMAN_ELEMENT_STATE_UNKNOWN   = 0,
-       CONNMAN_ELEMENT_STATE_CONNECT   = 1,
-       CONNMAN_ELEMENT_STATE_CONNECTED = 2,
-       CONNMAN_ELEMENT_STATE_CLOSED    = 3,
-};
-
-enum connman_element_policy {
-       CONNMAN_ELEMENT_POLICY_UNKNOWN = 0,
-       CONNMAN_ELEMENT_POLICY_IGNORE  = 1,
-       CONNMAN_ELEMENT_POLICY_AUTO    = 2,
-       CONNMAN_ELEMENT_POLICY_ASK     = 3,
-};
-
 enum connman_element_type {
        CONNMAN_ELEMENT_TYPE_UNKNOWN    = 0,
        CONNMAN_ELEMENT_TYPE_ROOT       = 1,
@@ -77,12 +63,7 @@ struct connman_element {
        gchar *name;
        gchar *path;
        enum connman_element_type type;
-       enum connman_element_state state;
-       enum connman_element_policy policy;
        gboolean enabled;
-       guint16 priority;
-       guint8 strength;
-       gchar *devpath;
        gchar *devname;
 
        struct connman_element *parent;
@@ -98,7 +79,7 @@ struct connman_element {
                struct connman_network *network;
        };
 
-       GSList *properties;
+       GHashTable *properties;
 
        struct {
                enum connman_ipv4_method method;
@@ -109,26 +90,16 @@ struct connman_element {
                gchar *broadcast;
                gchar *nameserver;
        } ipv4;
-
-       struct {
-               gchar *security;
-               gchar *passphrase;
-       } wifi;
 };
 
 extern struct connman_element *connman_element_create(const char *name);
 extern struct connman_element *connman_element_ref(struct connman_element *element);
 extern void connman_element_unref(struct connman_element *element);
 
-extern int connman_element_add_static_property(struct connman_element *element,
-                               const char *name, int type, const void *value);
 extern int connman_element_set_static_property(struct connman_element *element,
                                const char *name, int type, const void *value);
-extern int connman_element_add_static_array_property(struct connman_element *element,
+extern int connman_element_set_static_array_property(struct connman_element *element,
                        const char *name, int type, const void *value, int len);
-extern int connman_element_define_properties(struct connman_element *element, ...);
-extern int connman_element_create_property(struct connman_element *element,
-                                               const char *name, int type);
 extern int connman_element_set_property(struct connman_element *element,
                                enum connman_property_id id, const void *value);
 extern int connman_element_get_value(struct connman_element *element,
@@ -148,8 +119,6 @@ extern void connman_element_update(struct connman_element *element);
 
 extern int connman_element_set_enabled(struct connman_element *element,
                                                        gboolean enabled);
-extern int connman_element_set_scanning(struct connman_element *element,
-                                                       gboolean scanning);
 
 static inline void *connman_element_get_data(struct connman_element *element)
 {