Use Enabled property instead of Connected

7 files changed, 14 insertions, 15 deletions

diff --git a/include/element.h b/include/element.h
index c0702acc..9b8beabc 100644
--- a/include/element.h
+++ b/include/element.h
@@ -72,7 +72,7 @@ struct connman_element {
 	enum connman_element_type type;
 	enum connman_element_subtype subtype;
 	enum connman_element_state state;
-	gboolean connected;
+	gboolean enabled;
 	guint16 priority;
 
 	struct connman_element *parent;
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 826b902e..05611339 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -57,7 +57,7 @@ static int network_enable(struct connman_element *element)
 
 	__supplicant_disconnect(element);
 
-	element->connected = FALSE;
+	element->enabled = FALSE;
 
 	connman_element_update(element);
 
@@ -81,7 +81,7 @@ static int network_disable(struct connman_element *element)
 
 	__supplicant_disconnect(element);
 
-	element->connected = FALSE;
+	element->enabled = FALSE;
 
 	connman_element_update(element);
 
@@ -148,7 +148,7 @@ static void state_change(struct connman_element *parent,
 
 		dhcp_element = dhcp;
 
-		element->connected = TRUE;
+		element->enabled = TRUE;
 
 		connman_element_update(element);
 
diff --git a/src/element.c b/src/element.c
index 72290d92..db7cb4e7 100644
--- a/src/element.c
+++ b/src/element.c
@@ -176,8 +176,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
 	if (str != NULL)
 		append_entry(&dict, "Subtype", DBUS_TYPE_STRING, &str);
 
-	append_entry(&dict, "Connected",
-				DBUS_TYPE_BOOLEAN, &element->connected);
+	append_entry(&dict, "Enabled", DBUS_TYPE_BOOLEAN, &element->enabled);
 
 	if (element->priority > 0)
 		append_entry(&dict, "Priority",
@@ -438,7 +437,7 @@ struct connman_element *connman_element_create(void)
 	element->subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
 	element->state   = CONNMAN_ELEMENT_STATE_CLOSED;
 
-	element->connected = FALSE;
+	element->enabled = FALSE;
 
 	element->netdev.index = -1;
 
diff --git a/test/disable-network b/test/disable-network
index 12da1e83..eede449b 100755
--- a/test/disable-network
+++ b/test/disable-network
@@ -18,8 +18,8 @@ for path in elements:
 		if (properties["Type"] != "network"):
 			continue
 
-		if (properties["Connected"] == dbus.Boolean(1)):
-			print "Disconnecting %s" % (path)
-			element.Disconnect()
+		if (properties["Enabled"] == dbus.Boolean(1)):
+			print "Disabling %s" % (path)
+			element.Disable()
 	except:
 		pass
diff --git a/test/list-networks b/test/list-networks
index d3fa34d9..c7998636 100755
--- a/test/list-networks
+++ b/test/list-networks
@@ -19,7 +19,7 @@ for path in elements:
 		print "[ %s ]" % (path)
 
 	if (properties["Type"] == "network"):
-		if (properties["Connected"] == 1):
+		if (properties["Enabled"] == 1):
 			state = "*"
 		else:
 			state = " "
diff --git a/test/monitor-state b/test/monitor-state
index d17c0e5a..b4bd1de0 100755
--- a/test/monitor-state
+++ b/test/monitor-state
@@ -27,7 +27,7 @@ def element_added(path):
 
 def element_updated(path):
 	properties = get_properties(path)
-	if (properties["Type"] == "network" and properties["Connected"] == 1):
+	if (properties["Type"] == "network" and properties["Enabled"] == 1):
 		print "Associated with %s" % (properties["SSID"])
 
 def element_removed(path):
diff --git a/test/select-network b/test/select-network
index 2d5b2b1e..afa287c5 100755
--- a/test/select-network
+++ b/test/select-network
@@ -22,9 +22,9 @@ for path in elements:
 	if (properties["Type"] != "network"):
 		continue
 
-	if (properties["Connected"] == dbus.Boolean(1)):
+	if (properties["Enabled"] == dbus.Boolean(1)):
 		continue
 
 	if (properties["Identifier"] == sys.argv[1]):
-		print "Connecting %s" % (path)
-		element.Connect()
+		print "Enabling %s" % (path)
+		element.Enable()