diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-01-15 13:42:09 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-01-15 13:54:45 +0100 |
| commit | e00d36f5dd29818700ab150d604cee045803584e (patch) | |
| tree | 8ab4b3740a4a6557e3eebe1c5b96108054ac4747 | |
| parent | 05f66697e4a49b963806f09ccb3bba1751ef915e (diff) | |
| download | NetworkManager-e00d36f5dd29818700ab150d604cee045803584e.tar.gz | |
core: drop "Groups" property from WifiP2PPeer D-Bus API
This property is currently most likely not used. Also, because libnm doesn't
expose it and the only known user of this API (gnome-network-displays) doesn't
use it.
In the future we may want to expand on the Groups API. E.g. exposing groups as
separate D-Bus objects, in which case a better property type would be "ao" and
not "as". For now, that is unclear nor requested.
Remove the property for now.
| -rw-r--r-- | introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml | 5 | ||||
| -rw-r--r-- | src/devices/wifi/nm-wifi-p2p-peer.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml index 693d26b5f0..9bbba3b834 100644 --- a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml +++ b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml @@ -10,6 +10,11 @@ <annotation name="org.gtk.GDBus.C.Name" value="Wifi_P2P_Peer"/> <!-- + before 1.24, we wrongly exposed a property "Groups" ("as"). Don't reuse + that property name. + --> + + <!-- Name: Device name. diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/devices/wifi/nm-wifi-p2p-peer.c index ccdd56c4fd..08e7120886 100644 --- a/src/devices/wifi/nm-wifi-p2p-peer.c +++ b/src/devices/wifi/nm-wifi-p2p-peer.c @@ -688,6 +688,7 @@ static const NMDBusInterfaceInfoExtended interface_info_p2p_peer = { .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT ( NM_DBUS_INTERFACE_WIFI_P2P_PEER, .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS ( + /* Before 1.24, we wrongly exposed a property "Groups" of type "as". Don't reuse that property name. */ NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Flags", "u", NM_WIFI_P2P_PEER_FLAGS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Name", "s", NM_WIFI_P2P_PEER_NAME), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Manufacturer", "s", NM_WIFI_P2P_PEER_MANUFACTURER), @@ -695,7 +696,6 @@ static const NMDBusInterfaceInfoExtended interface_info_p2p_peer = { NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("ModelNumber", "s", NM_WIFI_P2P_PEER_MODEL_NUMBER), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Serial", "s", NM_WIFI_P2P_PEER_SERIAL), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("WfdIEs", "ay", NM_WIFI_P2P_PEER_WFD_IES), - NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Groups", "as", NM_WIFI_P2P_PEER_GROUPS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("HwAddress", "s", NM_WIFI_P2P_PEER_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Strength", "y", NM_WIFI_P2P_PEER_STRENGTH), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("LastSeen", "i", NM_WIFI_P2P_PEER_LAST_SEEN), |