Use generic Name property instead of WiFi.Name

[connman] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index ddaf8fc..3c22339 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -70,7 +70,7 @@ static void append_devices(DBusMessageIter *dict)
        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);
 
@@ -96,7 +96,7 @@ static void append_connections(DBusMessageIter *dict)
        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);
 
@@ -149,7 +149,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
        append_devices(&dict);
        append_connections(&dict);
 
-       if (__connman_element_count(CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
+       if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
                append_state(&dict, "online");
        else
                append_state(&dict, "offline");
@@ -207,6 +207,7 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
        return reply;
 }
 
+#if 0
 static DBusMessage *list_elements(DBusConnection *conn,
                                        DBusMessage *msg, void *data)
 {
@@ -230,20 +231,25 @@ static DBusMessage *list_elements(DBusConnection *conn,
 
        return reply;
 }
+#endif
 
 static GDBusMethodTable manager_methods[] = {
        { "GetProperties",   "",  "a{sv}", get_properties   },
        { "RegisterAgent",   "o", "",      register_agent   },
        { "UnregisterAgent", "o", "",      unregister_agent },
+#if 0
        { "ListElements",    "",  "ao",    list_elements    },
+#endif
        { },
 };
 
 static GDBusSignalTable manager_signals[] = {
        { "PropertyChanged", "sv" },
+#if 0
        { "ElementAdded",    "o"  },
        { "ElementUpdated",  "o"  },
        { "ElementRemoved",  "o"  },
+#endif
        { },
 };