fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 08:10:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: drop deprecated PropertiesChanged D-Bus signal (API BREAK)

Browse source 
D-Bus 1.3.1 (2010) introduced the standard "PropertiesChanged" signal
on "org.freedesktop.DBus.Properties". NetworkManager is old, and predates
this API. From that time, it still had it's own PropertiesChanged signal
that are emitted together with the standard ones. NetworkManager
supports the standard PropertiesChanged signal since it switched to
gdbus library in version 1.2.0 (2016).

These own signals are deprecated for a long time already ([1], 2016), and
are hopefully not used by anybody anymore. libnm-glib was using them and
relied on them, but that library is gone. libnm does not use them and neither
does plasma-nm.

Hopefully no users are left that are affected by this API break.

[1] 6fb917178a
This commit is contained in:
Thomas Haller 2021-05-12 18:18:57 +02:00
parent c8900a437a
commit 48dce1b66c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
87 changed files with 477 additions and 1100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -16,6 +16,9 @@ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
* Enforce valid "connection.uuid" by normalizing the string to lower * Enforce valid "connection.uuid" by normalizing the string to lower
case. This changes the UUID of existing profiles that had an invalid, case. This changes the UUID of existing profiles that had an invalid,
non-normalized value. non-normalized value.
* API BREAK: D-Bus: remove long deprecated PropertiesChanged signal from D-Bus
API. They are replaced by standard PropertiesChanged signal on the
"org.freedesktop.DBus.Properties" interface.
============================================= =============================================
NetworkManager-1.30 NetworkManager-1.30

9
introspection/org.freedesktop.NetworkManager.AccessPoint.xml
View file

@ -95,14 +95,5 @@
--> -->
<property name="LastSeen" type="i" access="read"/> <property name="LastSeen" type="i" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.AgentManager.xml
View file

@ -38,5 +38,6 @@
when they disconnect from D-Bus. when they disconnect from D-Bus.
--> -->
<method name="Unregister"/> <method name="Unregister"/>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Checkpoint.xml
View file

@ -32,14 +32,5 @@
--> -->
<property name="RollbackTimeout" type="u" access="read"/> <property name="RollbackTimeout" type="u" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Connection.Active.xml
View file

@ -169,14 +169,5 @@
--> -->
<property name="Master" type="o" access="read"/> <property name="Master" type="o" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.DHCP4Config.xml
View file

@ -17,14 +17,5 @@
--> -->
<property name="Options" type="a{sv}" access="read"/> <property name="Options" type="a{sv}" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

10
introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
View file

@ -16,15 +16,5 @@
Configuration options returned by a DHCP server, if any. Configuration options returned by a DHCP server, if any.
--> -->
<property name="Options" type="a{sv}" access="read"/> <property name="Options" type="a{sv}" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

11
introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
View file

@ -7,16 +7,6 @@
--> -->
<interface name="org.freedesktop.NetworkManager.Device.Adsl"> <interface name="org.freedesktop.NetworkManager.Device.Adsl">
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
<!-- <!--
Carrier: Carrier:
@ -26,5 +16,6 @@
property on the "org.freedesktop.NetworkManager.Device" interface. property on the "org.freedesktop.NetworkManager.Device" interface.
--> -->
<property name="Carrier" type="b" access="read"/> <property name="Carrier" type="b" access="read"/>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml
View file

@ -32,14 +32,5 @@
--> -->
<property name="BtCapabilities" type="u" access="read"/> <property name="BtCapabilities" type="u" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Bond.xml
View file

@ -35,14 +35,5 @@ n
--> -->
<property name="Slaves" type="ao" access="read"/> <property name="Slaves" type="ao" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
View file

@ -35,14 +35,5 @@ n
--> -->
<property name="Slaves" type="ao" access="read"/> <property name="Slaves" type="ao" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Dummy.xml
View file

@ -16,14 +16,5 @@ n
--> -->
<property name="HwAddress" type="s" access="read"/> <property name="HwAddress" type="s" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Generic.xml
View file

@ -23,14 +23,5 @@ n
--> -->
<property name="TypeDescription" type="s" access="read"/> <property name="TypeDescription" type="s" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
View file

@ -95,14 +95,5 @@
--> -->
<property name="Flags" type="u" access="read"/> <property name="Flags" type="u" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
View file

@ -27,14 +27,5 @@ n
--> -->
<property name="Carrier" type="b" access="read"/> <property name="Carrier" type="b" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
View file

@ -22,5 +22,6 @@
The object path of the parent device. The object path of the parent device.
--> -->
<property name="Parent" type="o" access="read"/> <property name="Parent" type="o" access="read"/>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Macsec.xml
View file

@ -105,14 +105,5 @@
--> -->
<property name="ReplayProtect" type="b" access="read"/> <property name="ReplayProtect" type="b" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml
View file

@ -35,14 +35,5 @@
--> -->
<property name="Tap" type="b" access="read"/> <property name="Tap" type="b" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

10
introspection/org.freedesktop.NetworkManager.Device.Modem.xml
View file

@ -58,15 +58,5 @@
--> -->
<property name="Apn" type="s" access="read" /> <property name="Apn" type="s" access="read" />
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml
View file

@ -30,14 +30,5 @@
--> -->
<property name="ActiveChannel" type="u" access="read"/> <property name="ActiveChannel" type="u" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary containing the FIXME: check changed parameters.
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
View file

@ -17,14 +17,5 @@
--> -->
<property name="Slaves" type="ao" access="read"/> <property name="Slaves" type="ao" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml
View file

@ -7,14 +7,5 @@
--> -->
<interface name="org.freedesktop.NetworkManager.Device.OvsInterface"> <interface name="org.freedesktop.NetworkManager.Device.OvsInterface">
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
View file

@ -17,14 +17,5 @@
--> -->
<property name="Slaves" type="ao" access="read"/> <property name="Slaves" type="ao" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Ppp.xml
View file

@ -7,14 +7,5 @@
--> -->
<interface name="org.freedesktop.NetworkManager.Device.Ppp"> <interface name="org.freedesktop.NetworkManager.Device.Ppp">
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Statistics.xml
View file

@ -31,14 +31,5 @@
--> -->
<property name="RxBytes" type="t" access="read"/> <property name="RxBytes" type="t" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Team.xml
View file

@ -42,14 +42,5 @@ n
--> -->
<property name="Config" type="s" access="read" /> <property name="Config" type="s" access="read" />
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Tun.xml
View file

@ -61,14 +61,5 @@ n
--> -->
<property name="HwAddress" type="s" access="read"/> <property name="HwAddress" type="s" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Veth.xml
View file

@ -14,14 +14,5 @@
--> -->
<property name="Peer" type="o" access="read"/> <property name="Peer" type="o" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
View file

@ -41,14 +41,5 @@ n
--> -->
<property name="VlanId" type="u" access="read"/> <property name="VlanId" type="u" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.Device.Vrf.xml
View file

@ -13,5 +13,6 @@
The routing table of the VRF. The routing table of the VRF.
--> -->
<property name="Table" type="u" access="read"/> <property name="Table" type="u" access="read"/>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml
View file

@ -135,14 +135,5 @@ n
--> -->
<property name="L3miss" type="b" access="read"/> <property name="L3miss" type="b" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

11
introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
View file

@ -85,16 +85,6 @@
--> -->
<property name="ActiveNsp" type="o" access="read"/> <property name="ActiveNsp" type="o" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values.
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
<!-- <!--
NspAdded: NspAdded:
@nsp: The object path of the newly found NSP. @nsp: The object path of the newly found NSP.
@ -114,5 +104,6 @@
<signal name="NspRemoved"> <signal name="NspRemoved">
<arg name="nsp" type="o"/> <arg name="nsp" type="o"/>
</signal> </signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml
View file

@ -33,5 +33,6 @@
See: ip-rule(8) See: ip-rule(8)
--> -->
<property name="FwMark" type="u" access="read"/> <property name="FwMark" type="u" access="read"/>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Device.Wired.xml
View file

@ -49,14 +49,5 @@
--> -->
<property name="Carrier" type="b" access="read"/> <property name="Carrier" type="b" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

13
introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
View file

@ -108,16 +108,6 @@
--> -->
<property name="LastScan" type="x" access="read"/> <property name="LastScan" type="x" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary containing the changed parameters.
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
<!-- <!--
AccessPointAdded: AccessPointAdded:
@access_point: The object path of the newly found access point. @access_point: The object path of the newly found access point.
@ -126,7 +116,7 @@
--> -->
<signal name="AccessPointAdded"> <signal name="AccessPointAdded">
<arg name="access_point" type="o"/> <arg name="access_point" type="o"/>
</signal> </signal>
<!-- <!--
AccessPointRemoved: AccessPointRemoved:
@ -137,5 +127,6 @@
<signal name="AccessPointRemoved"> <signal name="AccessPointRemoved">
<arg name="access_point" type="o"/> <arg name="access_point" type="o"/>
</signal> </signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.Device.xml
View file

@ -391,5 +391,6 @@
<arg name="old_state" type="u"/> <arg name="old_state" type="u"/>
<arg name="reason" type="u"/> <arg name="reason" type="u"/>
</signal> </signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.IP4Config.xml
View file

@ -115,14 +115,5 @@
--> -->
<property name="WinsServerData" type="as" access="read"/> <property name="WinsServerData" type="as" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.IP6Config.xml
View file

@ -88,14 +88,5 @@
--> -->
<property name="DnsPriority" type="i" access="read"/> <property name="DnsPriority" type="i" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.SecretAgent.xml
View file

@ -89,5 +89,6 @@
<arg name="connection" type="a{sa{sv}}" direction="in"/> <arg name="connection" type="a{sa{sv}}" direction="in"/>
<arg name="connection_path" type="o" direction="in"/> <arg name="connection_path" type="o" direction="in"/>
</method> </method>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
View file

@ -186,14 +186,5 @@
--> -->
<property name="Filename" type="s" access="read"/> <property name="Filename" type="s" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values.
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

11
introspection/org.freedesktop.NetworkManager.Settings.xml
View file

@ -159,16 +159,6 @@
--> -->
<property name="CanModify" type="b" access="read"/> <property name="CanModify" type="b" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
<!-- <!--
NewConnection: NewConnection:
@connection: Object path of the new connection. @connection: Object path of the new connection.
@ -199,5 +189,6 @@
<signal name="ConnectionRemoved"> <signal name="ConnectionRemoved">
<arg name="connection" type="o"/> <arg name="connection" type="o"/>
</signal> </signal>
</interface> </interface>
</node> </node>

11
introspection/org.freedesktop.NetworkManager.VPN.Connection.xml
View file

@ -10,16 +10,6 @@
<interface name="org.freedesktop.NetworkManager.VPN.Connection"> <interface name="org.freedesktop.NetworkManager.VPN.Connection">
<annotation name="org.gtk.GDBus.C.Name" value="VpnConnection"/> <annotation name="org.gtk.GDBus.C.Name" value="VpnConnection"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
<!-- <!--
VpnState: VpnState:
@ -47,5 +37,6 @@
<arg name="state" type="u"/> <arg name="state" type="u"/>
<arg name="reason" type="u"/> <arg name="reason" type="u"/>
</signal> </signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
View file

@ -199,5 +199,6 @@
<signal name="Failure"> <signal name="Failure">
<arg name="reason" type="u"/> <arg name="reason" type="u"/>
</signal> </signal>
</interface> </interface>
</node> </node>

9
introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
View file

@ -31,14 +31,5 @@
--> -->
<property name="NetworkType" type="u" access="read"/> <property name="NetworkType" type="u" access="read"/>
<!--
PropertiesChanged:
@properties: A dictionary mapping property names to variant boxed values.
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
</interface> </interface>
</node> </node>

1
introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
View file

@ -107,5 +107,6 @@
Since: 1.16 Since: 1.16
--> -->
<property name="LastSeen" type="i" access="read"/> <property name="LastSeen" type="i" access="read"/>
</interface> </interface>
</node> </node>

11
introspection/org.freedesktop.NetworkManager.xml
View file

@ -549,16 +549,6 @@
--> -->
<property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite"/> <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite"/>
<!--
PropertiesChanged:
@properties: The changed properties.
DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-->
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}"/>
</signal>
<!-- <!--
DeviceAdded: DeviceAdded:
@device_path: The object path of the newly added device. @device_path: The object path of the newly added device.
@ -578,5 +568,6 @@
<signal name="DeviceRemoved"> <signal name="DeviceRemoved">
<arg name="device_path" type="o"/> <arg name="device_path" type="o"/>
</signal> </signal>
</interface> </interface>
</node> </node>

6
src/core/devices/adsl/nm-device-adsl.c
View file

@ -674,12 +674,8 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_adsl = { static const NMDBusInterfaceInfoExtended interface_info_device_adsl = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_ADSL, NM_DBUS_INTERFACE_DEVICE_ADSL,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER), ), ),
"b",
NM_DEVICE_CARRIER), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

14
src/core/devices/bluetooth/nm-device-bt.c
View file

@ -1317,16 +1317,12 @@ finalize(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_bluetooth = { static const NMDBusInterfaceInfoExtended interface_info_device_bluetooth = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Name", "s", NM_DEVICE_BT_NAME),
NM_DEVICE_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("BtCapabilities",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Name", "s", NM_DEVICE_BT_NAME), "u",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("BtCapabilities", NM_DEVICE_BT_CAPABILITIES), ), ),
"u",
NM_DEVICE_BT_CAPABILITIES), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

12
src/core/devices/nm-device-bond.c
View file

@ -601,16 +601,10 @@ nm_device_bond_init(NMDeviceBond *self)
static const NMDBusInterfaceInfoExtended interface_info_device_bond = { static const NMDBusInterfaceInfoExtended interface_info_device_bond = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_BOND, NM_DBUS_INTERFACE_DEVICE_BOND,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
NM_DEVICE_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier", "b", NM_DEVICE_CARRIER),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Slaves",
"ao",
NM_DEVICE_SLAVES), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

12
src/core/devices/nm-device-bridge.c
View file

@ -1142,16 +1142,10 @@ nm_device_bridge_init(NMDeviceBridge *self)
static const NMDBusInterfaceInfoExtended interface_info_device_bridge = { static const NMDBusInterfaceInfoExtended interface_info_device_bridge = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_BRIDGE, NM_DBUS_INTERFACE_DEVICE_BRIDGE,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
NM_DEVICE_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier", "b", NM_DEVICE_CARRIER),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Slaves",
"ao",
NM_DEVICE_SLAVES), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

8
src/core/devices/nm-device-dummy.c
View file

@ -121,12 +121,10 @@ nm_device_dummy_init(NMDeviceDummy *self)
static const NMDBusInterfaceInfoExtended interface_info_device_dummy = { static const NMDBusInterfaceInfoExtended interface_info_device_dummy = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_DUMMY, NM_DBUS_INTERFACE_DEVICE_DUMMY,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress",
"s", "s",
NM_DEVICE_HW_ADDRESS), ), ), NM_DEVICE_HW_ADDRESS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

26
src/core/devices/nm-device-ethernet.c
View file

@ -2002,24 +2002,16 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps
static const NMDBusInterfaceInfoExtended interface_info_device_wired = { static const NMDBusInterfaceInfoExtended interface_info_device_wired = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_WIRED, NM_DBUS_INTERFACE_DEVICE_WIRED,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PermHwAddress",
NM_DEVICE_HW_ADDRESS), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("PermHwAddress", NM_DEVICE_PERM_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Speed", "u", NM_DEVICE_ETHERNET_SPEED),
NM_DEVICE_PERM_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("S390Subchannels",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Speed", "as",
"u", NM_DEVICE_ETHERNET_S390_SUBCHANNELS),
NM_DEVICE_ETHERNET_SPEED), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER), ), ),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("S390Subchannels",
"as",
NM_DEVICE_ETHERNET_S390_SUBCHANNELS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier",
"b",
NM_DEVICE_CARRIER), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

8
src/core/devices/nm-device-generic.c
View file

@ -191,16 +191,12 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_generic = { static const NMDBusInterfaceInfoExtended interface_info_device_generic = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_GENERIC, NM_DBUS_INTERFACE_DEVICE_GENERIC,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
NM_DEVICE_HW_ADDRESS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L(
"TypeDescription", "TypeDescription",
"s", "s",
NM_DEVICE_GENERIC_TYPE_DESCRIPTION), ), ), NM_DEVICE_GENERIC_TYPE_DESCRIPTION), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

10
src/core/devices/nm-device-infiniband.c
View file

@ -366,15 +366,9 @@ nm_device_infiniband_init(NMDeviceInfiniband *self)
static const NMDBusInterfaceInfoExtended interface_info_device_infiniband = { static const NMDBusInterfaceInfoExtended interface_info_device_infiniband = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_INFINIBAND, NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER), ), ),
NM_DEVICE_HW_ADDRESS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier",
"b",
NM_DEVICE_CARRIER), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

58
src/core/devices/nm-device-ip-tunnel.c
View file

@ -1050,39 +1050,33 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_ip_tunnel = { static const NMDBusInterfaceInfoExtended interface_info_device_ip_tunnel = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL, NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "u", NM_DEVICE_IP_TUNNEL_MODE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "u", NM_DEVICE_IP_TUNNEL_MODE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Parent", "o", NM_DEVICE_PARENT), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Local", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Local", "s", NM_DEVICE_IP_TUNNEL_LOCAL),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Remote",
NM_DEVICE_IP_TUNNEL_LOCAL), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Remote", NM_DEVICE_IP_TUNNEL_REMOTE),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ttl", "y", NM_DEVICE_IP_TUNNEL_TTL),
NM_DEVICE_IP_TUNNEL_REMOTE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Tos", "y", NM_DEVICE_IP_TUNNEL_TOS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ttl", "y", NM_DEVICE_IP_TUNNEL_TTL), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PathMtuDiscovery",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Tos", "y", NM_DEVICE_IP_TUNNEL_TOS), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L( NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY),
"PathMtuDiscovery", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("InputKey",
"b", "s",
NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY), NM_DEVICE_IP_TUNNEL_INPUT_KEY),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("InputKey", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("OutputKey",
"s", "s",
NM_DEVICE_IP_TUNNEL_INPUT_KEY), NM_DEVICE_IP_TUNNEL_OUTPUT_KEY),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("OutputKey", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("EncapsulationLimit",
"s", "y",
NM_DEVICE_IP_TUNNEL_OUTPUT_KEY), NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("FlowLabel",
"EncapsulationLimit", "u",
"y", NM_DEVICE_IP_TUNNEL_FLOW_LABEL),
NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Flags",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("FlowLabel", "u",
"u", NM_DEVICE_IP_TUNNEL_FLAGS), ), ),
NM_DEVICE_IP_TUNNEL_FLOW_LABEL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Flags",
"u",
NM_DEVICE_IP_TUNNEL_FLAGS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

62
src/core/devices/nm-device-macsec.c
View file

@ -870,40 +870,36 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_macsec = { static const NMDBusInterfaceInfoExtended interface_info_device_macsec = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_MACSEC, NM_DBUS_INTERFACE_DEVICE_MACSEC,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Parent", "o", NM_DEVICE_PARENT), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Sci", "t", NM_DEVICE_MACSEC_SCI), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Sci", "t", NM_DEVICE_MACSEC_SCI),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("IcvLength", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("IcvLength",
"y", "y",
NM_DEVICE_MACSEC_ICV_LENGTH), NM_DEVICE_MACSEC_ICV_LENGTH),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("CipherSuite", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("CipherSuite",
"t", "t",
NM_DEVICE_MACSEC_CIPHER_SUITE), NM_DEVICE_MACSEC_CIPHER_SUITE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Window", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Window", "u", NM_DEVICE_MACSEC_WINDOW),
"u", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("EncodingSa",
NM_DEVICE_MACSEC_WINDOW), "y",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("EncodingSa", NM_DEVICE_MACSEC_ENCODING_SA),
"y", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Validation",
NM_DEVICE_MACSEC_ENCODING_SA), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Validation", NM_DEVICE_MACSEC_VALIDATION),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Encrypt",
NM_DEVICE_MACSEC_VALIDATION), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Encrypt", NM_DEVICE_MACSEC_ENCRYPT),
"b", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Protect",
NM_DEVICE_MACSEC_ENCRYPT), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Protect", NM_DEVICE_MACSEC_PROTECT),
"b", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("IncludeSci",
NM_DEVICE_MACSEC_PROTECT), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("IncludeSci", NM_DEVICE_MACSEC_INCLUDE_SCI),
"b", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Es", "b", NM_DEVICE_MACSEC_ES),
NM_DEVICE_MACSEC_INCLUDE_SCI), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Scb", "b", NM_DEVICE_MACSEC_SCB),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Es", "b", NM_DEVICE_MACSEC_ES), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ReplayProtect",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Scb", "b", NM_DEVICE_MACSEC_SCB), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("ReplayProtect", NM_DEVICE_MACSEC_REPLAY_PROTECT), ), ),
"b",
NM_DEVICE_MACSEC_REPLAY_PROTECT), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

16
src/core/devices/nm-device-macvlan.c
View file

@ -502,17 +502,13 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = { static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_MACVLAN, NM_DBUS_INTERFACE_DEVICE_MACVLAN,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Parent", "o", NM_DEVICE_PARENT), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "s", NM_DEVICE_MACVLAN_MODE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "s", NM_DEVICE_MACVLAN_MODE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("NoPromisc", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NoPromisc",
"b", "b",
NM_DEVICE_MACVLAN_NO_PROMISC), NM_DEVICE_MACVLAN_NO_PROMISC),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Tab", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Tab", "b", NM_DEVICE_MACVLAN_TAP), ), ),
"b",
NM_DEVICE_MACVLAN_TAP), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

5
src/core/devices/nm-device-ppp.c
View file

@ -274,10 +274,7 @@ dispose(GObject *object)
} }
static const NMDBusInterfaceInfoExtended interface_info_device_ppp = { static const NMDBusInterfaceInfoExtended interface_info_device_ppp = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(NM_DBUS_INTERFACE_DEVICE_PPP, ),
NM_DBUS_INTERFACE_DEVICE_PPP,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

26
src/core/devices/nm-device-tun.c
View file

@ -444,22 +444,18 @@ nm_device_tun_init(NMDeviceTun *self)
static const NMDBusInterfaceInfoExtended interface_info_device_tun = { static const NMDBusInterfaceInfoExtended interface_info_device_tun = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_TUN, NM_DBUS_INTERFACE_DEVICE_TUN,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Owner", "x", NM_DEVICE_TUN_OWNER), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Owner", "x", NM_DEVICE_TUN_OWNER),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Group", "x", NM_DEVICE_TUN_GROUP), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Group", "x", NM_DEVICE_TUN_GROUP),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "s", NM_DEVICE_TUN_MODE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "s", NM_DEVICE_TUN_MODE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("NoPi", "b", NM_DEVICE_TUN_NO_PI), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NoPi", "b", NM_DEVICE_TUN_NO_PI),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("VnetHdr", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("VnetHdr", "b", NM_DEVICE_TUN_VNET_HDR),
"b", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("MultiQueue",
NM_DEVICE_TUN_VNET_HDR), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("MultiQueue", NM_DEVICE_TUN_MULTI_QUEUE),
"b", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress",
NM_DEVICE_TUN_MULTI_QUEUE), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEVICE_HW_ADDRESS), ), ),
"s",
NM_DEVICE_HW_ADDRESS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

6
src/core/devices/nm-device-veth.c
View file

@ -161,12 +161,8 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
static const NMDBusInterfaceInfoExtended interface_info_device_veth = { static const NMDBusInterfaceInfoExtended interface_info_device_veth = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_VETH, NM_DBUS_INTERFACE_DEVICE_VETH,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Peer", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Peer", "o", NM_DEVICE_VETH_PEER), ), ),
"o",
NM_DEVICE_VETH_PEER), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

14
src/core/devices/nm-device-vlan.c
View file

@ -547,17 +547,11 @@ nm_device_vlan_init(NMDeviceVlan *self)
static const NMDBusInterfaceInfoExtended interface_info_device_vlan = { static const NMDBusInterfaceInfoExtended interface_info_device_vlan = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_VLAN, NM_DBUS_INTERFACE_DEVICE_VLAN,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
NM_DEVICE_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier", "b", NM_DEVICE_CARRIER), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("VlanId", "u", NM_DEVICE_VLAN_ID), ), ),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Parent", "o", NM_DEVICE_PARENT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("VlanId",
"u",
NM_DEVICE_VLAN_ID), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

58
src/core/devices/nm-device-vxlan.c
View file

@ -576,38 +576,34 @@ nm_device_vxlan_init(NMDeviceVxlan *self)
static const NMDBusInterfaceInfoExtended interface_info_device_vxlan = { static const NMDBusInterfaceInfoExtended interface_info_device_vxlan = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_VXLAN, NM_DBUS_INTERFACE_DEVICE_VXLAN,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Parent", "o", NM_DEVICE_PARENT), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Id", "u", NM_DEVICE_VXLAN_ID),
NM_DEVICE_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Group", "s", NM_DEVICE_VXLAN_GROUP),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Id", "u", NM_DEVICE_VXLAN_ID), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Local", "s", NM_DEVICE_VXLAN_LOCAL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Group", "s", NM_DEVICE_VXLAN_GROUP), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Tos", "y", NM_DEVICE_VXLAN_TOS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Local", "s", NM_DEVICE_VXLAN_LOCAL), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ttl", "y", NM_DEVICE_VXLAN_TTL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Tos", "y", NM_DEVICE_VXLAN_TOS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Learning",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ttl", "y", NM_DEVICE_VXLAN_TTL), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Learning", NM_DEVICE_VXLAN_LEARNING),
"b", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ageing", "u", NM_DEVICE_VXLAN_AGEING),
NM_DEVICE_VXLAN_LEARNING), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Limit", "u", NM_DEVICE_VXLAN_LIMIT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ageing", "u", NM_DEVICE_VXLAN_AGEING), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DstPort",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Limit", "u", NM_DEVICE_VXLAN_LIMIT), "q",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DstPort", NM_DEVICE_VXLAN_DST_PORT),
"q", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("SrcPortMin",
NM_DEVICE_VXLAN_DST_PORT), "q",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("SrcPortMin", NM_DEVICE_VXLAN_SRC_PORT_MIN),
"q", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("SrcPortMax",
NM_DEVICE_VXLAN_SRC_PORT_MIN), "q",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("SrcPortMax", NM_DEVICE_VXLAN_SRC_PORT_MAX),
"q", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Proxy", "b", NM_DEVICE_VXLAN_PROXY),
NM_DEVICE_VXLAN_SRC_PORT_MAX), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Rsc", "b", NM_DEVICE_VXLAN_RSC),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Proxy", "b", NM_DEVICE_VXLAN_PROXY), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("L2miss", "b", NM_DEVICE_VXLAN_L2MISS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Rsc", "b", NM_DEVICE_VXLAN_RSC), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("L3miss",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("L2miss", "b", NM_DEVICE_VXLAN_L2MISS), "b",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("L3miss", NM_DEVICE_VXLAN_L3MISS), ), ),
"b",
NM_DEVICE_VXLAN_L3MISS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

137
src/core/devices/nm-device.c
View file

@ -18485,75 +18485,69 @@ static const NMDBusInterfaceInfoExtended interface_info_device = {
.handle = impl_device_delete, ), ), .handle = impl_device_delete, ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_state_changed, ), .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_state_changed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Udi", "s", NM_DEVICE_UDI), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Udi", "s", NM_DEVICE_UDI),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Path", "s", NM_DEVICE_PATH), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Path", "s", NM_DEVICE_PATH),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Interface", "s", NM_DEVICE_IFACE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Interface", "s", NM_DEVICE_IFACE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("IpInterface", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("IpInterface", "s", NM_DEVICE_IP_IFACE),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Driver", "s", NM_DEVICE_DRIVER),
NM_DEVICE_IP_IFACE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DriverVersion",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Driver", "s", NM_DEVICE_DRIVER), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DriverVersion", NM_DEVICE_DRIVER_VERSION),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("FirmwareVersion",
NM_DEVICE_DRIVER_VERSION), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("FirmwareVersion", NM_DEVICE_FIRMWARE_VERSION),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Capabilities",
NM_DEVICE_FIRMWARE_VERSION), "u",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Capabilities", NM_DEVICE_CAPABILITIES),
"u", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip4Address",
NM_DEVICE_CAPABILITIES), "u",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ip4Address", NM_DEVICE_IP4_ADDRESS),
"u", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("State", "u", NM_DEVICE_STATE),
NM_DEVICE_IP4_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("StateReason",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("State", "u", NM_DEVICE_STATE), "(uu)",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("StateReason", NM_DEVICE_STATE_REASON),
"(uu)", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ActiveConnection",
NM_DEVICE_STATE_REASON), "o",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("ActiveConnection", NM_DEVICE_ACTIVE_CONNECTION),
"o", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip4Config", "o", NM_DEVICE_IP4_CONFIG),
NM_DEVICE_ACTIVE_CONNECTION), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Dhcp4Config",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ip4Config", "o",
"o", NM_DEVICE_DHCP4_CONFIG),
NM_DEVICE_IP4_CONFIG), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip6Config", "o", NM_DEVICE_IP6_CONFIG),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Dhcp4Config", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Dhcp6Config",
"o", "o",
NM_DEVICE_DHCP4_CONFIG), NM_DEVICE_DHCP6_CONFIG),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ip6Config", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE("Managed",
"o", "b",
NM_DEVICE_IP6_CONFIG), NM_DEVICE_MANAGED,
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Dhcp6Config", NM_AUTH_PERMISSION_NETWORK_CONTROL,
"o", NM_AUDIT_OP_DEVICE_MANAGED),
NM_DEVICE_DHCP6_CONFIG), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE("Autoconnect",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L("Managed", "b",
"b", NM_DEVICE_AUTOCONNECT,
NM_DEVICE_MANAGED, NM_AUTH_PERMISSION_NETWORK_CONTROL,
NM_AUTH_PERMISSION_NETWORK_CONTROL, NM_AUDIT_OP_DEVICE_AUTOCONNECT),
NM_AUDIT_OP_DEVICE_MANAGED), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("FirmwareMissing",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L("Autoconnect", "b",
"b", NM_DEVICE_FIRMWARE_MISSING),
NM_DEVICE_AUTOCONNECT, NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NmPluginMissing",
NM_AUTH_PERMISSION_NETWORK_CONTROL, "b",
NM_AUDIT_OP_DEVICE_AUTOCONNECT), NM_DEVICE_NM_PLUGIN_MISSING),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("FirmwareMissing", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DeviceType",
"b", "u",
NM_DEVICE_FIRMWARE_MISSING), NM_DEVICE_DEVICE_TYPE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("NmPluginMissing", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AvailableConnections",
"b", "ao",
NM_DEVICE_NM_PLUGIN_MISSING), NM_DEVICE_AVAILABLE_CONNECTIONS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DeviceType", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PhysicalPortId",
"u", "s",
NM_DEVICE_DEVICE_TYPE), NM_DEVICE_PHYSICAL_PORT_ID),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("AvailableConnections", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mtu", "u", NM_DEVICE_MTU),
"ao", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Metered", "u", NM_DEVICE_METERED),
NM_DEVICE_AVAILABLE_CONNECTIONS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("LldpNeighbors",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("PhysicalPortId", "aa{sv}",
"s", NM_DEVICE_LLDP_NEIGHBORS),
NM_DEVICE_PHYSICAL_PORT_ID), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Real", "b", NM_DEVICE_REAL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mtu", "u", NM_DEVICE_MTU),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Metered", "u", NM_DEVICE_METERED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("LldpNeighbors",
"aa{sv}",
NM_DEVICE_LLDP_NEIGHBORS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Real", "b", NM_DEVICE_REAL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip4Connectivity", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip4Connectivity",
"u", "u",
NM_DEVICE_IP4_CONNECTIVITY), NM_DEVICE_IP4_CONNECTIVITY),
@ -18568,10 +18562,9 @@ static const NMDBusInterfaceInfoExtended interface_info_device = {
NM_DEVICE_HW_ADDRESS), ), ), NM_DEVICE_HW_ADDRESS), ), ),
}; };
const NMDBusInterfaceInfoExtended nm_interface_info_device_statistics = { static const NMDBusInterfaceInfoExtended interface_info_device_statistics = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_STATISTICS, NM_DBUS_INTERFACE_DEVICE_STATISTICS,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(
"RefreshRateMs", "RefreshRateMs",
@ -18597,7 +18590,7 @@ nm_device_class_init(NMDeviceClass *klass)
dbus_object_class->export_path = NM_DBUS_EXPORT_PATH_NUMBERED(NM_DBUS_PATH "/Devices"); dbus_object_class->export_path = NM_DBUS_EXPORT_PATH_NUMBERED(NM_DBUS_PATH "/Devices");
dbus_object_class->interface_infos = dbus_object_class->interface_infos =
NM_DBUS_INTERFACE_INFOS(&interface_info_device, &nm_interface_info_device_statistics); NM_DBUS_INTERFACE_INFOS(&interface_info_device, &interface_info_device_statistics);
object_class->dispose = dispose; object_class->dispose = dispose;
object_class->finalize = finalize; object_class->finalize = finalize;

4
src/core/devices/ovs/nm-device-ovs-bridge.c
View file

@ -134,9 +134,7 @@ static const NMDBusInterfaceInfoExtended interface_info_device_ovs_bridge = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE, NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

5
src/core/devices/ovs/nm-device-ovs-interface.c
View file

@ -405,10 +405,7 @@ dispose(GObject *object)
} }
static const NMDBusInterfaceInfoExtended interface_info_device_ovs_interface = { static const NMDBusInterfaceInfoExtended interface_info_device_ovs_interface = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE, ),
NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

4
src/core/devices/ovs/nm-device-ovs-port.c
View file

@ -167,9 +167,7 @@ static const NMDBusInterfaceInfoExtended interface_info_device_ovs_port = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_OVS_PORT, NM_DBUS_INTERFACE_DEVICE_OVS_PORT,
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

16
src/core/devices/team/nm-device-team.c
View file

@ -1042,17 +1042,13 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_team = { static const NMDBusInterfaceInfoExtended interface_info_device_team = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_TEAM, NM_DBUS_INTERFACE_DEVICE_TEAM,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
NM_DEVICE_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Carrier", "b", NM_DEVICE_CARRIER), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Config",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Slaves", "ao", NM_DEVICE_SLAVES), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Config", NM_DEVICE_TEAM_CONFIG), ), ),
"s",
NM_DEVICE_TEAM_CONFIG), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

14
src/core/devices/wifi/nm-device-olpc-mesh.c
View file

@ -492,19 +492,15 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_olpc_mesh = { static const NMDBusInterfaceInfoExtended interface_info_device_olpc_mesh = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH, NM_DBUS_INTERFACE_DEVICE_OLPC_MESH,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Companion",
NM_DEVICE_HW_ADDRESS), "o",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Companion", NM_DEVICE_OLPC_MESH_COMPANION),
"o", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
NM_DEVICE_OLPC_MESH_COMPANION),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L(
"ActiveChannel", "ActiveChannel",
"u", "u",
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL), ), ), NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

1
src/core/devices/wifi/nm-device-wifi-p2p.c
View file

@ -1149,7 +1149,6 @@ static const NMDBusInterfaceInfoExtended interface_info_device_wifi_p2p = {
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Peers", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Peers",
"ao", "ao",
NM_DEVICE_WIFI_P2P_PEERS), ), ), NM_DEVICE_WIFI_P2P_PEERS), ), ),
.legacy_property_changed = FALSE,
}; };
/*****************************************************************************/ /*****************************************************************************/

34
src/core/devices/wifi/nm-wifi-ap.c
View file

@ -862,27 +862,21 @@ finalize(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_access_point = { static const NMDBusInterfaceInfoExtended interface_info_access_point = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_ACCESS_POINT, NM_DBUS_INTERFACE_ACCESS_POINT,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Flags", "u", NM_WIFI_AP_FLAGS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Flags", "u", NM_WIFI_AP_FLAGS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("WpaFlags", "u", NM_WIFI_AP_WPA_FLAGS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WpaFlags", "u", NM_WIFI_AP_WPA_FLAGS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("RsnFlags", "u", NM_WIFI_AP_RSN_FLAGS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RsnFlags", "u", NM_WIFI_AP_RSN_FLAGS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ssid", "ay", NM_WIFI_AP_SSID), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ssid", "ay", NM_WIFI_AP_SSID),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Frequency", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Frequency", "u", NM_WIFI_AP_FREQUENCY),
"u", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_WIFI_AP_HW_ADDRESS),
NM_WIFI_AP_FREQUENCY), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "u", NM_WIFI_AP_MODE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("MaxBitrate",
"s", "u",
NM_WIFI_AP_HW_ADDRESS), NM_WIFI_AP_MAX_BITRATE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "u", NM_WIFI_AP_MODE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Strength", "y", NM_WIFI_AP_STRENGTH),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("MaxBitrate", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("LastSeen",
"u", "i",
NM_WIFI_AP_MAX_BITRATE), NM_WIFI_AP_LAST_SEEN), ), ),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Strength", "y", NM_WIFI_AP_STRENGTH),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("LastSeen",
"i",
NM_WIFI_AP_LAST_SEEN), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

38
src/core/devices/wifi/nm-wifi-common.c
View file

@ -146,31 +146,25 @@ const NMDBusInterfaceInfoExtended nm_interface_info_device_wireless = {
.in_args = NM_DEFINE_GDBUS_ARG_INFOS( .in_args = NM_DEFINE_GDBUS_ARG_INFOS(
NM_DEFINE_GDBUS_ARG_INFO("options", "a{sv}"), ), ), NM_DEFINE_GDBUS_ARG_INFO("options", "a{sv}"), ), ),
.handle = impl_device_wifi_request_scan, ), ), .handle = impl_device_wifi_request_scan, ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_wireless_access_point_added,
&nm_signal_info_wireless_access_point_added,
&nm_signal_info_wireless_access_point_removed, ), &nm_signal_info_wireless_access_point_removed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PermHwAddress",
NM_DEVICE_HW_ADDRESS), "s",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("PermHwAddress", NM_DEVICE_PERM_HW_ADDRESS),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "u", NM_DEVICE_WIFI_MODE),
NM_DEVICE_PERM_HW_ADDRESS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Bitrate", "u", NM_DEVICE_WIFI_BITRATE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "u", NM_DEVICE_WIFI_MODE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AccessPoints",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Bitrate", "ao",
"u", NM_DEVICE_WIFI_ACCESS_POINTS),
NM_DEVICE_WIFI_BITRATE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ActiveAccessPoint",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("AccessPoints", "o",
"ao", NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT),
NM_DEVICE_WIFI_ACCESS_POINTS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WirelessCapabilities",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("ActiveAccessPoint", "u",
"o", NM_DEVICE_WIFI_CAPABILITIES),
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("WirelessCapabilities",
"u",
NM_DEVICE_WIFI_CAPABILITIES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("LastScan", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("LastScan",
"x", "x",
NM_DEVICE_WIFI_LAST_SCAN), ), ), NM_DEVICE_WIFI_LAST_SCAN), ), ),
.legacy_property_changed = TRUE,
}; };

1
src/core/devices/wifi/nm-wifi-p2p-peer.c
View file

@ -608,7 +608,6 @@ static const NMDBusInterfaceInfoExtended interface_info_p2p_peer = {
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("LastSeen", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("LastSeen",
"i", "i",
NM_WIFI_P2P_PEER_LAST_SEEN), ), ), NM_WIFI_P2P_PEER_LAST_SEEN), ), ),
.legacy_property_changed = FALSE,
}; };
static void static void

14
src/core/devices/wwan/nm-device-modem.c
View file

@ -855,14 +855,13 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_device_modem = { static const NMDBusInterfaceInfoExtended interface_info_device_modem = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DEVICE_MODEM, NM_DBUS_INTERFACE_DEVICE_MODEM,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("ModemCapabilities", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ModemCapabilities",
"u", "u",
NM_DEVICE_MODEM_CAPABILITIES), NM_DEVICE_MODEM_CAPABILITIES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("CurrentCapabilities", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("CurrentCapabilities",
"u", "u",
NM_DEVICE_MODEM_CURRENT_CAPABILITIES), NM_DEVICE_MODEM_CURRENT_CAPABILITIES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DeviceId", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DeviceId",
"s", "s",
NM_DEVICE_MODEM_DEVICE_ID), NM_DEVICE_MODEM_DEVICE_ID),
@ -870,7 +869,6 @@ static const NMDBusInterfaceInfoExtended interface_info_device_modem = {
"s", "s",
NM_DEVICE_MODEM_OPERATOR_CODE), NM_DEVICE_MODEM_OPERATOR_CODE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Apn", "s", NM_DEVICE_MODEM_APN), ), ), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Apn", "s", NM_DEVICE_MODEM_APN), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

14
src/core/dns/nm-dns-manager.c
View file

@ -2618,13 +2618,13 @@ static const NMDBusInterfaceInfoExtended interface_info_dns_manager = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DNS_MANAGER, NM_DBUS_INTERFACE_DNS_MANAGER,
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "s", NM_DNS_MANAGER_MODE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "s", NM_DNS_MANAGER_MODE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("RcManager", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RcManager",
"s", "s",
NM_DNS_MANAGER_RC_MANAGER), NM_DNS_MANAGER_RC_MANAGER),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Configuration", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Configuration",
"aa{sv}", "aa{sv}",
NM_DNS_MANAGER_CONFIGURATION), ), ), NM_DNS_MANAGER_CONFIGURATION), ), ),
}; };
static void static void

88
src/core/nm-active-connection.c
View file

@ -1555,54 +1555,48 @@ static const GDBusSignalInfo signal_info_state_changed = NM_DEFINE_GDBUS_SIGNAL_
static const NMDBusInterfaceInfoExtended interface_info_active_connection = { static const NMDBusInterfaceInfoExtended interface_info_active_connection = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_ACTIVE_CONNECTION, NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_state_changed, ),
&signal_info_state_changed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Connection", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Connection",
"o", "o",
NM_ACTIVE_CONNECTION_CONNECTION), NM_ACTIVE_CONNECTION_CONNECTION),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("SpecificObject", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("SpecificObject",
"o", "o",
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT), NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Id", "s", NM_ACTIVE_CONNECTION_ID), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Id", "s", NM_ACTIVE_CONNECTION_ID),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Uuid", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Uuid", "s", NM_ACTIVE_CONNECTION_UUID),
"s", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Type", "s", NM_ACTIVE_CONNECTION_TYPE),
NM_ACTIVE_CONNECTION_UUID), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Devices",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Type", "ao",
"s", NM_ACTIVE_CONNECTION_DEVICES),
NM_ACTIVE_CONNECTION_TYPE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("State",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Devices", "u",
"ao", NM_ACTIVE_CONNECTION_STATE),
NM_ACTIVE_CONNECTION_DEVICES), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("StateFlags",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("State", "u",
"u", NM_ACTIVE_CONNECTION_STATE_FLAGS),
NM_ACTIVE_CONNECTION_STATE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Default",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("StateFlags", "b",
"u", NM_ACTIVE_CONNECTION_DEFAULT),
NM_ACTIVE_CONNECTION_STATE_FLAGS), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip4Config",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Default", "o",
"b", NM_ACTIVE_CONNECTION_IP4_CONFIG),
NM_ACTIVE_CONNECTION_DEFAULT), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Dhcp4Config",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ip4Config", "o",
"o", NM_ACTIVE_CONNECTION_DHCP4_CONFIG),
NM_ACTIVE_CONNECTION_IP4_CONFIG), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Default6",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Dhcp4Config", "b",
"o", NM_ACTIVE_CONNECTION_DEFAULT6),
NM_ACTIVE_CONNECTION_DHCP4_CONFIG), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip6Config",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Default6", "o",
"b", NM_ACTIVE_CONNECTION_IP6_CONFIG),
NM_ACTIVE_CONNECTION_DEFAULT6), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Dhcp6Config",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Ip6Config", "o",
"o", NM_ACTIVE_CONNECTION_DHCP6_CONFIG),
NM_ACTIVE_CONNECTION_IP6_CONFIG), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Vpn", "b", NM_ACTIVE_CONNECTION_VPN),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Dhcp6Config", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Master",
"o", "o",
NM_ACTIVE_CONNECTION_DHCP6_CONFIG), NM_ACTIVE_CONNECTION_MASTER), ), ),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Vpn", "b", NM_ACTIVE_CONNECTION_VPN),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Master",
"o",
NM_ACTIVE_CONNECTION_MASTER), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

14
src/core/nm-checkpoint.c
View file

@ -739,16 +739,12 @@ dispose(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_checkpoint = { static const NMDBusInterfaceInfoExtended interface_info_checkpoint = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_CHECKPOINT, NM_DBUS_INTERFACE_CHECKPOINT,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Devices", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Devices", "ao", NM_CHECKPOINT_DEVICES),
"ao", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Created", "x", NM_CHECKPOINT_CREATED),
NM_CHECKPOINT_DEVICES), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RollbackTimeout",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Created", "x", NM_CHECKPOINT_CREATED), "u",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("RollbackTimeout", NM_CHECKPOINT_ROLLBACK_TIMEOUT), ), ),
"u",
NM_CHECKPOINT_ROLLBACK_TIMEOUT), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

81
src/core/nm-dbus-manager.c
View file

@ -1139,10 +1139,6 @@ _nm_dbus_manager_obj_notify(NMDBusObject *obj, guint n_pspecs, const GParamSpec
NMDBusManagerPrivate *priv; NMDBusManagerPrivate *priv;
RegistrationData * reg_data; RegistrationData * reg_data;
guint i, p; guint i, p;
gboolean any_legacy_signals = FALSE;
gboolean any_legacy_properties = FALSE;
GVariantBuilder legacy_builder;
GVariant * device_statistics_args = NULL;
nm_assert(NM_IS_DBUS_OBJECT(obj)); nm_assert(NM_IS_DBUS_OBJECT(obj));
nm_assert(obj->internal.path); nm_assert(obj->internal.path);
@ -1159,13 +1155,6 @@ _nm_dbus_manager_obj_notify(NMDBusObject *obj, guint n_pspecs, const GParamSpec
if (G_UNLIKELY(!priv->started)) if (G_UNLIKELY(!priv->started))
return; return;
c_list_for_each_entry (reg_data, &obj->internal.registration_lst_head, registration_lst) {
if (_reg_data_get_interface_info(reg_data)->legacy_property_changed) {
any_legacy_signals = TRUE;
break;
}
}
/* do a naive search for the matching NMDBusPropertyInfoExtended infos. Since the number of /* do a naive search for the matching NMDBusPropertyInfoExtended infos. Since the number of
* (interfaces x properties) is static and possibly small, this naive search is effectively * (interfaces x properties) is static and possibly small, this naive search is effectively
* O(1). We might wanna introduce some index to lookup the properties in question faster. * O(1). We might wanna introduce some index to lookup the properties in question faster.
@ -1196,18 +1185,6 @@ _nm_dbus_manager_obj_notify(NMDBusObject *obj, guint n_pspecs, const GParamSpec
value = _obj_get_property(reg_data, i, TRUE); value = _obj_get_property(reg_data, i, TRUE);
if (property_info->include_in_legacy_property_changed && any_legacy_signals) {
/* also track the value in the legacy_builder to emit legacy signals below. */
if (!any_legacy_properties) {
any_legacy_properties = TRUE;
g_variant_builder_init(&legacy_builder, G_VARIANT_TYPE("a{sv}"));
}
g_variant_builder_add(&legacy_builder,
"{sv}",
property_info->parent.name,
value);
}
if (!has_properties) { if (!has_properties) {
has_properties = TRUE; has_properties = TRUE;
g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}")); g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
@ -1221,13 +1198,6 @@ _nm_dbus_manager_obj_notify(NMDBusObject *obj, guint n_pspecs, const GParamSpec
args = g_variant_builder_end(&builder); args = g_variant_builder_end(&builder);
if (G_UNLIKELY(interface_info == &nm_interface_info_device_statistics)) {
/* we treat the Device.Statistics signal special, because we need to
* emit a signal also for it (below). */
nm_assert(!device_statistics_args);
device_statistics_args = g_variant_ref_sink(args);
}
g_variant_builder_init(&invalidated_builder, G_VARIANT_TYPE("as")); g_variant_builder_init(&invalidated_builder, G_VARIANT_TYPE("as"));
g_dbus_connection_emit_signal( g_dbus_connection_emit_signal(
priv->main_dbus_connection, priv->main_dbus_connection,
@ -1238,57 +1208,6 @@ _nm_dbus_manager_obj_notify(NMDBusObject *obj, guint n_pspecs, const GParamSpec
g_variant_new("(s@a{sv}as)", interface_info->parent.name, args, &invalidated_builder), g_variant_new("(s@a{sv}as)", interface_info->parent.name, args, &invalidated_builder),
NULL); NULL);
} }
if (G_UNLIKELY(device_statistics_args)) {
/* this is a special interface: it has a legacy PropertiesChanged signal,
* however, contrary to other interfaces with ~regular~ legacy signals,
* we only notify about properties that actually belong to this interface. */
g_dbus_connection_emit_signal(priv->main_dbus_connection,
NULL,
obj->internal.path,
nm_interface_info_device_statistics.parent.name,
"PropertiesChanged",
g_variant_new("(@a{sv})", device_statistics_args),
NULL);
g_variant_unref(device_statistics_args);
}
if (any_legacy_properties) {
gs_unref_variant GVariant *args = NULL;
/* The legacy PropertyChanged signal on the NetworkManager D-Bus interface is
* deprecated for the standard signal on org.freedesktop.DBus.Properties. However,
* for backward compatibility, we still need to emit it.
*
* Due to a bug in dbus-glib in NetworkManager <= 1.0, the signal would
* not only notify about properties that were actually on the corresponding
* D-Bus interface. Instead, it would notify about all relevant properties
* on all interfaces that had such a signal.
*
* For example, "HwAddress" gets emitted both on "fdo.NM.Device.Ethernet"
* and "fdo.NM.Device.Veth" for veth interfaces, although only the former
* actually has such a property.
* Also note that "fdo.NM.Device" interface has no legacy signal. All notifications
* about its properties are instead emitted on the interfaces of the subtypes.
*
* See bgo#770629 and commit bef26a2e69f51259095fa080221db73de09fd38d.
*/
args = g_variant_ref_sink(g_variant_new("(a{sv})", &legacy_builder));
c_list_for_each_entry (reg_data, &obj->internal.registration_lst_head, registration_lst) {
const NMDBusInterfaceInfoExtended *interface_info =
_reg_data_get_interface_info(reg_data);
if (interface_info->legacy_property_changed) {
g_dbus_connection_emit_signal(priv->main_dbus_connection,
NULL,
obj->internal.path,
interface_info->parent.name,
"PropertiesChanged",
args,
NULL);
}
}
}
} }
void void

11
src/core/nm-dbus-object.h
View file

@ -45,17 +45,6 @@ typedef struct {
/*****************************************************************************/ /*****************************************************************************/
/* "org.freedesktop.NetworkManager.Device.Statistics" is a special interface,
* because although it has a legacy PropertiesChanged signal, it only notifies
* about properties that actually exist on that interface. That is, because it
* was added with 1.4.0 release, and thus didn't have the broken behavior like
* other legacy interfaces. Those notify about *all* properties, even if they
* are not part of that D-Bus interface. See also "include_in_legacy_property_changed"
* and "legacy_property_changed". */
extern const NMDBusInterfaceInfoExtended nm_interface_info_device_statistics;
/*****************************************************************************/
#define NM_TYPE_DBUS_OBJECT (nm_dbus_object_get_type()) #define NM_TYPE_DBUS_OBJECT (nm_dbus_object_get_type())
#define NM_DBUS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DBUS_OBJECT, NMDBusObject)) #define NM_DBUS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DBUS_OBJECT, NMDBusObject))
#define NM_DBUS_OBJECT_CLASS(klass) \ #define NM_DBUS_OBJECT_CLASS(klass) \

4
src/core/nm-dbus-utils.c
View file

@ -11,10 +11,6 @@
/*****************************************************************************/ /*****************************************************************************/
const GDBusSignalInfo nm_signal_info_property_changed_legacy = NM_DEFINE_GDBUS_SIGNAL_INFO_INIT(
"PropertiesChanged",
.args = NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("properties", "a{sv}"), ), );
GDBusPropertyInfo * GDBusPropertyInfo *
nm_dbus_utils_interface_info_lookup_property(const GDBusInterfaceInfo *interface_info, nm_dbus_utils_interface_info_lookup_property(const GDBusInterfaceInfo *interface_info,
const char * property_name, const char * property_name,

118
src/core/nm-dbus-utils.h
View file

@ -14,11 +14,6 @@ struct _NMDBusMethodInfoExtended;
struct _NMDBusPropertyInfoExtendedBase { struct _NMDBusPropertyInfoExtendedBase {
GDBusPropertyInfo _parent; GDBusPropertyInfo _parent;
const char * property_name; const char * property_name;
/* Whether the properties needs to be notified on the legacy
* PropertyChanged signal. This is only to preserve API, new
* properties should not use this. */
bool include_in_legacy_property_changed;
}; };
struct _NMDBusPropertyInfoExtendedReadWritable { struct _NMDBusPropertyInfoExtendedReadWritable {
@ -43,93 +38,46 @@ typedef struct {
struct { struct {
GDBusPropertyInfo parent; GDBusPropertyInfo parent;
const char * property_name; const char * property_name;
/* Whether the properties needs to be notified on the legacy
* PropertyChanged signal. This is only to preserve API, new
* properties should not use this. */
bool include_in_legacy_property_changed;
}; };
}; };
} NMDBusPropertyInfoExtended; } NMDBusPropertyInfoExtended;
G_STATIC_ASSERT(G_STRUCT_OFFSET(NMDBusPropertyInfoExtended, property_name) G_STATIC_ASSERT(G_STRUCT_OFFSET(NMDBusPropertyInfoExtended, property_name)
== G_STRUCT_OFFSET(struct _NMDBusPropertyInfoExtendedBase, property_name)); == G_STRUCT_OFFSET(struct _NMDBusPropertyInfoExtendedBase, property_name));
G_STATIC_ASSERT(G_STRUCT_OFFSET(NMDBusPropertyInfoExtended, include_in_legacy_property_changed)
== G_STRUCT_OFFSET(struct _NMDBusPropertyInfoExtendedBase,
include_in_legacy_property_changed));
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_FULL(m_name, \
m_signature, \
m_property_name, \
m_include_in_legacy_property_changed) \
((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedBase){ \
._parent = \
{ \
.ref_count = -1, \
.name = m_name, \
.signature = m_signature, \
.flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE, \
}, \
.property_name = m_property_name, \
.include_in_legacy_property_changed = m_include_in_legacy_property_changed, \
}))
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(m_name, m_signature, m_property_name) \ #define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(m_name, m_signature, m_property_name) \
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_FULL(m_name, m_signature, m_property_name, FALSE) ((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedBase){ \
._parent = \
/* define a legacy property. Do not use for new code. */ { \
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L(m_name, m_signature, m_property_name) \ .ref_count = -1, \
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_FULL(m_name, m_signature, m_property_name, TRUE) .name = m_name, \
.signature = m_signature, \
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_FULL( \ .flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE, \
m_name, \ }, \
m_signature, \ .property_name = m_property_name, \
m_property_name, \
m_permission, \
m_audit_op, \
m_include_in_legacy_property_changed) \
((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedReadWritable){ \
._base = \
{ \
._parent = \
{ \
.ref_count = -1, \
.name = m_name, \
.signature = m_signature, \
.flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE \
| G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, \
}, \
.property_name = m_property_name, \
.include_in_legacy_property_changed = m_include_in_legacy_property_changed, \
}, \
.permission = m_permission, \
.audit_op = m_audit_op, \
})) }))
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(m_name, \ #define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(m_name, \
m_signature, \ m_signature, \
m_property_name, \ m_property_name, \
m_permission, \ m_permission, \
m_audit_op) \ m_audit_op) \
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_FULL(m_name, \ ((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedReadWritable){ \
m_signature, \ ._base = \
m_property_name, \ { \
m_permission, \ ._parent = \
m_audit_op, \ { \
FALSE) .ref_count = -1, \
.name = m_name, \
/* define a legacy property. Do not use for new code. */ .signature = m_signature, \
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L(m_name, \ .flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE \
m_signature, \ | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, \
m_property_name, \ }, \
m_permission, \ .property_name = m_property_name, \
m_audit_op) \ }, \
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_FULL(m_name, \ .permission = m_permission, \
m_signature, \ .audit_op = m_audit_op, \
m_property_name, \ }))
m_permission, \
m_audit_op, \
TRUE)
typedef struct _NMDBusMethodInfoExtended { typedef struct _NMDBusMethodInfoExtended {
GDBusMethodInfo parent; GDBusMethodInfo parent;
@ -148,14 +96,8 @@ typedef struct _NMDBusMethodInfoExtended {
typedef struct _NMDBusInterfaceInfoExtended { typedef struct _NMDBusInterfaceInfoExtended {
GDBusInterfaceInfo parent; GDBusInterfaceInfo parent;
/* Whether the interface has a legacy property changed signal (@nm_signal_info_property_changed_legacy).
* New interfaces should not use this. */
bool legacy_property_changed : 1;
} NMDBusInterfaceInfoExtended; } NMDBusInterfaceInfoExtended;
extern const GDBusSignalInfo nm_signal_info_property_changed_legacy;
#define NM_DBUS_INTERFACE_INFOS(...) \ #define NM_DBUS_INTERFACE_INFOS(...) \
({ \ ({ \
static const NMDBusInterfaceInfoExtended *const _interface_infos[] = { \ static const NMDBusInterfaceInfoExtended *const _interface_infos[] = { \

16
src/core/nm-dhcp-config.c
View file

@ -194,12 +194,10 @@ nm_dhcp4_config_init(NMDhcp4Config *self)
static const NMDBusInterfaceInfoExtended interface_info_dhcp4_config = { static const NMDBusInterfaceInfoExtended interface_info_dhcp4_config = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DHCP4_CONFIG, NM_DBUS_INTERFACE_DHCP4_CONFIG,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Options", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Options",
"a{sv}", "a{sv}",
NM_DHCP_CONFIG_OPTIONS), ), ), NM_DHCP_CONFIG_OPTIONS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void
@ -234,12 +232,10 @@ nm_dhcp6_config_init(NMDhcp6Config *self)
static const NMDBusInterfaceInfoExtended interface_info_dhcp6_config = { static const NMDBusInterfaceInfoExtended interface_info_dhcp6_config = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_DHCP6_CONFIG, NM_DBUS_INTERFACE_DHCP6_CONFIG,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Options", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Options",
"a{sv}", "a{sv}",
NM_DHCP_CONFIG_OPTIONS), ), ), NM_DHCP_CONFIG_OPTIONS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

58
src/core/nm-ip4-config.c
View file

@ -3143,44 +3143,40 @@ finalize(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_ip4_config = { static const NMDBusInterfaceInfoExtended interface_info_ip4_config = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_IP4_CONFIG, NM_DBUS_INTERFACE_IP4_CONFIG,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Addresses", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Addresses",
"aau", "aau",
NM_IP4_CONFIG_ADDRESSES), NM_IP4_CONFIG_ADDRESSES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("AddressData", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AddressData",
"aa{sv}", "aa{sv}",
NM_IP4_CONFIG_ADDRESS_DATA), NM_IP4_CONFIG_ADDRESS_DATA),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Gateway", "s", NM_IP4_CONFIG_GATEWAY), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Gateway", "s", NM_IP4_CONFIG_GATEWAY),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Routes", "aau", NM_IP4_CONFIG_ROUTES), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Routes", "aau", NM_IP4_CONFIG_ROUTES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("RouteData", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RouteData",
"aa{sv}", "aa{sv}",
NM_IP4_CONFIG_ROUTE_DATA), NM_IP4_CONFIG_ROUTE_DATA),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NameserverData", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NameserverData",
"aa{sv}", "aa{sv}",
NM_IP4_CONFIG_NAMESERVER_DATA), NM_IP4_CONFIG_NAMESERVER_DATA),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Nameservers", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Nameservers",
"au", "au",
NM_IP4_CONFIG_NAMESERVERS), NM_IP4_CONFIG_NAMESERVERS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Domains", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Domains", "as", NM_IP4_CONFIG_DOMAINS),
"as", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Searches",
NM_IP4_CONFIG_DOMAINS), "as",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Searches", NM_IP4_CONFIG_SEARCHES),
"as", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DnsOptions",
NM_IP4_CONFIG_SEARCHES), "as",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DnsOptions", NM_IP4_CONFIG_DNS_OPTIONS),
"as", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DnsPriority",
NM_IP4_CONFIG_DNS_OPTIONS), "i",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DnsPriority", NM_IP4_CONFIG_DNS_PRIORITY),
"i",
NM_IP4_CONFIG_DNS_PRIORITY),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WinsServerData", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WinsServerData",
"as", "as",
NM_IP4_CONFIG_WINS_SERVER_DATA), NM_IP4_CONFIG_WINS_SERVER_DATA),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("WinsServers", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WinsServers",
"au", "au",
NM_IP4_CONFIG_WINS_SERVERS), ), ), NM_IP4_CONFIG_WINS_SERVERS), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

56
src/core/nm-ip6-config.c
View file

@ -2585,37 +2585,33 @@ finalize(GObject *object)
static const NMDBusInterfaceInfoExtended interface_info_ip6_config = { static const NMDBusInterfaceInfoExtended interface_info_ip6_config = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_IP6_CONFIG, NM_DBUS_INTERFACE_IP6_CONFIG,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Addresses", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Addresses",
"a(ayuay)", "a(ayuay)",
NM_IP6_CONFIG_ADDRESSES), NM_IP6_CONFIG_ADDRESSES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("AddressData", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AddressData",
"aa{sv}", "aa{sv}",
NM_IP6_CONFIG_ADDRESS_DATA), NM_IP6_CONFIG_ADDRESS_DATA),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Gateway", "s", NM_IP6_CONFIG_GATEWAY), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Gateway", "s", NM_IP6_CONFIG_GATEWAY),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Routes", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Routes",
"a(ayuayu)", "a(ayuayu)",
NM_IP6_CONFIG_ROUTES), NM_IP6_CONFIG_ROUTES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("RouteData", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RouteData",
"aa{sv}", "aa{sv}",
NM_IP6_CONFIG_ROUTE_DATA), NM_IP6_CONFIG_ROUTE_DATA),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Nameservers", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Nameservers",
"aay", "aay",
NM_IP6_CONFIG_NAMESERVERS), NM_IP6_CONFIG_NAMESERVERS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Domains", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Domains", "as", NM_IP6_CONFIG_DOMAINS),
"as", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Searches",
NM_IP6_CONFIG_DOMAINS), "as",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Searches", NM_IP6_CONFIG_SEARCHES),
"as", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DnsOptions",
NM_IP6_CONFIG_SEARCHES), "as",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DnsOptions", NM_IP6_CONFIG_DNS_OPTIONS),
"as", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DnsPriority",
NM_IP6_CONFIG_DNS_OPTIONS), "i",
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("DnsPriority", NM_IP6_CONFIG_DNS_PRIORITY), ), ),
"i",
NM_IP6_CONFIG_DNS_PRIORITY), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

103
src/core/nm-manager.c
View file

@ -8423,76 +8423,74 @@ static const NMDBusInterfaceInfoExtended interface_info_manager = {
NM_DEFINE_GDBUS_ARG_INFO("checkpoint", "o"), NM_DEFINE_GDBUS_ARG_INFO("checkpoint", "o"),
NM_DEFINE_GDBUS_ARG_INFO("add_timeout", "u"), ), ), NM_DEFINE_GDBUS_ARG_INFO("add_timeout", "u"), ), ),
.handle = impl_manager_checkpoint_adjust_rollback_timeout, ), ), .handle = impl_manager_checkpoint_adjust_rollback_timeout, ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_check_permissions,
&signal_info_check_permissions,
&signal_info_state_changed, &signal_info_state_changed,
&signal_info_device_added, &signal_info_device_added,
&signal_info_device_removed, ), &signal_info_device_removed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Devices", "ao", NM_MANAGER_DEVICES), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Devices", "ao", NM_MANAGER_DEVICES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("AllDevices", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AllDevices",
"ao", "ao",
NM_MANAGER_ALL_DEVICES), NM_MANAGER_ALL_DEVICES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Checkpoints", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Checkpoints",
"ao", "ao",
NM_MANAGER_CHECKPOINTS), NM_MANAGER_CHECKPOINTS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("NetworkingEnabled", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NetworkingEnabled",
"b", "b",
NM_MANAGER_NETWORKING_ENABLED), NM_MANAGER_NETWORKING_ENABLED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(
"WirelessEnabled", "WirelessEnabled",
"b", "b",
NM_MANAGER_WIRELESS_ENABLED, NM_MANAGER_WIRELESS_ENABLED,
NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI,
NM_AUDIT_OP_RADIO_CONTROL), NM_AUDIT_OP_RADIO_CONTROL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("WirelessHardwareEnabled", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WirelessHardwareEnabled",
"b", "b",
NM_MANAGER_WIRELESS_HARDWARE_ENABLED), NM_MANAGER_WIRELESS_HARDWARE_ENABLED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(
"WwanEnabled", "WwanEnabled",
"b", "b",
NM_MANAGER_WWAN_ENABLED, NM_MANAGER_WWAN_ENABLED,
NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN, NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN,
NM_AUDIT_OP_RADIO_CONTROL), NM_AUDIT_OP_RADIO_CONTROL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("WwanHardwareEnabled", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WwanHardwareEnabled",
"b", "b",
NM_MANAGER_WWAN_HARDWARE_ENABLED), NM_MANAGER_WWAN_HARDWARE_ENABLED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(
"WimaxEnabled", "WimaxEnabled",
"b", "b",
NM_MANAGER_WIMAX_ENABLED, NM_MANAGER_WIMAX_ENABLED,
NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX,
NM_AUDIT_OP_RADIO_CONTROL), NM_AUDIT_OP_RADIO_CONTROL),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("WimaxHardwareEnabled", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WimaxHardwareEnabled",
"b", "b",
NM_MANAGER_WIMAX_HARDWARE_ENABLED), NM_MANAGER_WIMAX_HARDWARE_ENABLED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("ActiveConnections", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ActiveConnections",
"ao", "ao",
NM_MANAGER_ACTIVE_CONNECTIONS), NM_MANAGER_ACTIVE_CONNECTIONS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("PrimaryConnection", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PrimaryConnection",
"o", "o",
NM_MANAGER_PRIMARY_CONNECTION), NM_MANAGER_PRIMARY_CONNECTION),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("PrimaryConnectionType", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PrimaryConnectionType",
"s", "s",
NM_MANAGER_PRIMARY_CONNECTION_TYPE), NM_MANAGER_PRIMARY_CONNECTION_TYPE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Metered", "u", NM_MANAGER_METERED), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Metered", "u", NM_MANAGER_METERED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("ActivatingConnection", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ActivatingConnection",
"o", "o",
NM_MANAGER_ACTIVATING_CONNECTION), NM_MANAGER_ACTIVATING_CONNECTION),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Startup", "b", NM_MANAGER_STARTUP), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Startup", "b", NM_MANAGER_STARTUP),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Version", "s", NM_MANAGER_VERSION), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Version", "s", NM_MANAGER_VERSION),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Capabilities", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Capabilities",
"au", "au",
NM_MANAGER_CAPABILITIES), NM_MANAGER_CAPABILITIES),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("State", "u", NM_MANAGER_STATE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("State", "u", NM_MANAGER_STATE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Connectivity", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Connectivity",
"u", "u",
NM_MANAGER_CONNECTIVITY), NM_MANAGER_CONNECTIVITY),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ConnectivityCheckAvailable",
"ConnectivityCheckAvailable", "b",
"b", NM_MANAGER_CONNECTIVITY_CHECK_AVAILABLE),
NM_MANAGER_CONNECTIVITY_CHECK_AVAILABLE), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L(
"ConnectivityCheckEnabled", "ConnectivityCheckEnabled",
"b", "b",
NM_MANAGER_CONNECTIVITY_CHECK_ENABLED, NM_MANAGER_CONNECTIVITY_CHECK_ENABLED,
@ -8501,13 +8499,12 @@ static const NMDBusInterfaceInfoExtended interface_info_manager = {
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ConnectivityCheckUri", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ConnectivityCheckUri",
"s", "s",
NM_MANAGER_CONNECTIVITY_CHECK_URI), NM_MANAGER_CONNECTIVITY_CHECK_URI),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE_L( NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(
"GlobalDnsConfiguration", "GlobalDnsConfiguration",
"a{sv}", "a{sv}",
NM_MANAGER_GLOBAL_DNS_CONFIGURATION, NM_MANAGER_GLOBAL_DNS_CONFIGURATION,
NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS, NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS,
NM_AUDIT_OP_NET_CONTROL), ), ), NM_AUDIT_OP_NET_CONTROL), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

11
src/core/settings/nm-settings-connection.c
View file

@ -2673,20 +2673,17 @@ static const NMDBusInterfaceInfoExtended interface_info_settings_connection = {
.out_args = .out_args =
NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("result", "a{sv}"), ), ), NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("result", "a{sv}"), ), ),
.handle = impl_settings_connection_update2, ), ), .handle = impl_settings_connection_update2, ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_updated, &signal_info_removed, ),
&signal_info_updated,
&signal_info_removed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Unsaved", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Unsaved",
"b", "b",
NM_SETTINGS_CONNECTION_UNSAVED), NM_SETTINGS_CONNECTION_UNSAVED),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Flags", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Flags",
"u", "u",
NM_SETTINGS_CONNECTION_FLAGS), NM_SETTINGS_CONNECTION_FLAGS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Filename", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Filename",
"s", "s",
NM_SETTINGS_CONNECTION_FILENAME), ), ), NM_SETTINGS_CONNECTION_FILENAME), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

18
src/core/settings/nm-settings.c
View file

@ -4026,18 +4026,16 @@ static const NMDBusInterfaceInfoExtended interface_info_settings = {
.in_args = .in_args =
NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("hostname", "s"), ), ), NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("hostname", "s"), ), ),
.handle = impl_settings_save_hostname, ), ), .handle = impl_settings_save_hostname, ), ),
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_new_connection,
&signal_info_new_connection,
&signal_info_connection_removed, ), &signal_info_connection_removed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Connections", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Connections",
"ao", "ao",
NM_SETTINGS_CONNECTIONS), NM_SETTINGS_CONNECTIONS),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Hostname", "s", NM_SETTINGS_HOSTNAME), NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Hostname", "s", NM_SETTINGS_HOSTNAME),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("CanModify", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("CanModify",
"b", "b",
NM_SETTINGS_CAN_MODIFY), ), ), NM_SETTINGS_CAN_MODIFY), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void

16
src/core/vpn/nm-vpn-connection.c
View file

@ -2906,16 +2906,14 @@ static const GDBusSignalInfo signal_info_vpn_state_changed = NM_DEFINE_GDBUS_SIG
static const NMDBusInterfaceInfoExtended interface_info_vpn_connection = { static const NMDBusInterfaceInfoExtended interface_info_vpn_connection = {
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT( .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
NM_DBUS_INTERFACE_VPN_CONNECTION, NM_DBUS_INTERFACE_VPN_CONNECTION,
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, .signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&signal_info_vpn_state_changed, ),
&signal_info_vpn_state_changed, ),
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS( .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("VpnState", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("VpnState",
"u", "u",
NM_VPN_CONNECTION_VPN_STATE), NM_VPN_CONNECTION_VPN_STATE),
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Banner", NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Banner",
"s", "s",
NM_VPN_CONNECTION_BANNER), ), ), NM_VPN_CONNECTION_BANNER), ), ),
.legacy_property_changed = TRUE,
}; };
static void static void