This email list is read-only. Emails sent to this list will be discarded ---------------------------------- doc/device-api.txt | 5 ++++- src/element.c | 36 ++++++++++++++++++++++++++++++++++++ test/test-manager | 4 ++-- 3 files changed, 42 insertions(+), 3 deletions(-)
New commits: commit 8b0d086c892b72cfdef0ee799e515b60e43c9766 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 16 04:54:15 2008 +0100 Add Scanning property to device objects commit eef3cadcb3bce384b8fb2b0531386c982021dc39 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 16 04:50:48 2008 +0100 Fix Name property of device objects Diff in this email is a maximum of 400 lines. diff --git a/doc/device-api.txt b/doc/device-api.txt index 847b6f4..7df3791 100644 --- a/doc/device-api.txt +++ b/doc/device-api.txt @@ -45,7 +45,10 @@ Signals PropertyChanged(string name, variant value) Properties string Name [readonly] - The device name (for example eth0, wlan0 etc.) + The device name (for example "Wireless" etc.) + + This name can be used for directly displaying it in + the application. It has pure informational purpose. string Type [readonly] diff --git a/src/element.c b/src/element.c index 9b91ab0..a39cc09 100644 --- a/src/element.c +++ b/src/element.c @@ -145,6 +145,28 @@ static const char *subtype2string(enum connman_element_subtype type) return NULL; } +static const char *subtype2description(enum connman_element_subtype type) +{ + switch (type) { + case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN: + case CONNMAN_ELEMENT_SUBTYPE_FAKE: + case CONNMAN_ELEMENT_SUBTYPE_NETWORK: + return NULL; + case CONNMAN_ELEMENT_SUBTYPE_ETHERNET: + return "Ethernet"; + case CONNMAN_ELEMENT_SUBTYPE_WIFI: + return "Wireless"; + case CONNMAN_ELEMENT_SUBTYPE_WIMAX: + return "WiMAX"; + case CONNMAN_ELEMENT_SUBTYPE_MODEM: + return "Modem"; + case CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH: + return "Bluetooth"; + } + + return NULL; +} + const char *__connman_element_policy2string(enum connman_element_policy policy) { switch (policy) { @@ -465,6 +487,15 @@ static DBusMessage *device_get_properties(DBusConnection *conn, DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); + str = subtype2description(element->subtype); + if (str != NULL && element->devname != NULL) { + char *name = g_strdup_printf("%s (%s)", str, element->devname); + if (name != NULL) + connman_dbus_dict_append_variant(&dict, "Name", + DBUS_TYPE_STRING, &name); + g_free(name); + } + str = subtype2string(element->subtype); if (str != NULL) connman_dbus_dict_append_variant(&dict, "Type", @@ -480,6 +511,11 @@ static DBusMessage *device_get_properties(DBusConnection *conn, if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI || element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX) { + dbus_bool_t scanning = FALSE; + + connman_dbus_dict_append_variant(&dict, "Scanning", + DBUS_TYPE_BOOLEAN, &scanning); + dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry); append_networks(element, &entry); diff --git a/test/test-manager b/test/test-manager index c0ad77d..09c6e19 100755 --- a/test/test-manager +++ b/test/test-manager @@ -31,8 +31,8 @@ def print_properties(key, value): if key == "Networks": continue - if key in ["Powered", "Connected", "Available", - "Remember", "Default"]: + if key in ["Powered", "Scanning", "Connected", + "Available", "Remember", "Default"]: if properties[key] == dbus.Boolean(1): val = "true" else: _______________________________________________ Commits mailing list [email protected] https://lists.moblin.org/mailman/listinfo/commits
