summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-12-09 18:20:04 +0100
committerMarcel Holtmann <marcel@holtmann.org>2008-12-09 18:20:04 +0100
commitb7f59753507e5ee0076a5cf4687d06b3da2ca0d3 (patch)
tree79e7a19fc9a30776a250e5172c75c9b4a109e36d /plugins
parent1cfc371f117c273f8b633dd9e5b74dd95be7ecf1 (diff)
downloadconnman-b7f59753507e5ee0076a5cf4687d06b3da2ca0d3.tar.gz
connman-b7f59753507e5ee0076a5cf4687d06b3da2ca0d3.tar.bz2
connman-b7f59753507e5ee0076a5cf4687d06b3da2ca0d3.zip
Use generic Name property instead of WiFi.Name
Diffstat (limited to 'plugins')
-rw-r--r--plugins/wifi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 5462bf28..39f288d7 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -61,14 +61,14 @@ static void network_remove(struct connman_element *element)
static int network_enable(struct connman_element *element)
{
- char *identifier, *security = NULL, *passphrase = NULL;
+ char *name, *security = NULL, *passphrase = NULL;
unsigned char *ssid;
int ssid_len;
DBG("element %p name %s", element, element->name);
if (connman_element_get_static_property(element,
- "WiFi.Name", &identifier) == FALSE)
+ "Name", &name) == FALSE)
return -EIO;
if (connman_element_get_static_array_property(element,
@@ -83,7 +83,7 @@ static int network_enable(struct connman_element *element)
if (data != NULL) {
g_free(data->identifier);
- data->identifier = g_strdup(identifier);
+ data->identifier = g_strdup(name);
}
}
@@ -93,8 +93,8 @@ static int network_enable(struct connman_element *element)
connman_element_get_value(element,
CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &passphrase);
- DBG("identifier %s security %s passhprase %s",
- identifier, security, passphrase);
+ DBG("name %s security %s passhprase %s",
+ name, security, passphrase);
if (__supplicant_connect(element, ssid, ssid_len,
security, passphrase) < 0)
@@ -133,7 +133,7 @@ static struct connman_element *find_element(struct wifi_data *data,
struct connman_element *element = list->data;
if (connman_element_match_static_property(element,
- "WiFi.Name", &identifier) == TRUE)
+ "Name", &identifier) == TRUE)
return element;
}
@@ -216,7 +216,7 @@ static void scan_result(struct connman_element *parent,
data->list = g_slist_append(data->list, element);
- connman_element_add_static_property(element, "WiFi.Name",
+ connman_element_add_static_property(element, "Name",
DBUS_TYPE_STRING, &network->identifier);
connman_element_add_static_array_property(element, "WiFi.SSID",