dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
dbus_message_iter_close_container(&value, &iter);
append_devices(&dict);
append_connections(&dict);
- append_state(&dict, "offline");
+ if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
+ append_state(&dict, "online");
+ else
+ append_state(&dict, "offline");
dbus_message_iter_close_container(&array, &dict);
return reply;
}
-static DBusMessage *list_elements(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- DBusMessage *reply;
- DBusMessageIter array, iter;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
- __connman_element_list(CONNMAN_ELEMENT_TYPE_UNKNOWN, &iter);
-
- dbus_message_iter_close_container(&array, &iter);
-
- return reply;
-}
-
static GDBusMethodTable manager_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
{ "RegisterAgent", "o", "", register_agent },
{ "UnregisterAgent", "o", "", unregister_agent },
- { "ListElements", "", "ao", list_elements },
{ },
};
static GDBusSignalTable manager_signals[] = {
{ "PropertyChanged", "sv" },
- { "ElementAdded", "o" },
- { "ElementUpdated", "o" },
- { "ElementRemoved", "o" },
{ },
};