fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 14:10:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm/trivial: rename enums NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_*

Browse source 
We will need more levels of priority. Change the naming
to make room for that.

  sed 's/NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW/NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10/g' `git grep -l NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_ ` -i
  sed 's/NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW/NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10/g' `git grep -l NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_ ` -i
  ./contrib/scripts/nm-code-format-container.sh

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>

[thaller@redhat.com: split original patch]
This commit is contained in:
Fernando Fernandez Mancera 2020-11-18 10:16:40 +01:00 • committed by Thomas Haller
parent 8dc28e4b5e
commit 23972add8c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
38 changed files with 83 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm/nm-access-point.c
View file

@ -472,7 +472,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_accesspoint = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_ACCESS_POINT,
nm_access_point_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("Flags", PROP_FLAGS, NMAccessPoint, _priv.flags),
NML_DBUS_META_PROPERTY_INIT_U("Frequency", PROP_FREQUENCY, NMAccessPoint, _priv.frequency),

2
libnm/nm-active-connection.c
View file

@ -542,7 +542,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_connection_active = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
nm_active_connection_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_O_PROP("Connection",
PROP_CONNECTION,

2
libnm/nm-checkpoint.c
View file

@ -128,7 +128,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_checkpoint = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_CHECKPOINT,
nm_checkpoint_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_X("Created", PROP_CREATED, NMCheckpoint, _priv.created),
NML_DBUS_META_PROPERTY_INIT_AO_PROP("Devices",

2
libnm/nm-client.c
View file

@ -2694,7 +2694,7 @@ _obj_handle_dbus_changes(NMClient *self, NMLDBusObject *dbobj)
nml_dbus_object_set_obj_state(dbobj, NML_DBUS_OBJ_STATE_WITH_NMOBJ_READY, self);
} else {
GType gtype = G_TYPE_NONE;
NMLDBusMetaInteracePrio curr_prio = NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW - 1;
NMLDBusMetaInteracePrio curr_prio = NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10 - 1;
c_list_for_each_entry (db_iface_data, &dbobj->iface_lst_head, iface_lst) {
nm_assert(!db_iface_data->iface_removed);

2
libnm/nm-device-6lowpan.c
View file

@ -94,7 +94,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_lowpan = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_6LOWPAN,
nm_device_6lowpan_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
0,

2
libnm/nm-device-adsl.c
View file

@ -100,7 +100,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_adsl = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_ADSL,
nm_device_adsl_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceAdsl, _priv.carrier), ), );

2
libnm/nm-device-bond.c
View file

@ -155,7 +155,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bond = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_BOND,
nm_device_bond_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceBond, _priv.carrier),
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",

2
libnm/nm-device-bridge.c
View file

@ -149,7 +149,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bridge = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_BRIDGE,
nm_device_bridge_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceBridge, _priv.carrier),
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",

2
libnm/nm-device-bt.c
View file

@ -218,7 +218,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bluetooth = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
nm_device_bt_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("BtCapabilities",
PROP_BT_CAPABILITIES,

2
libnm/nm-device-dummy.c
View file

@ -93,7 +93,7 @@ nm_device_dummy_init(NMDeviceDummy *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_dummy = NML_DBUS_META_IFACE_INIT(
NM_DBUS_INTERFACE_DEVICE_DUMMY,
nm_device_dummy_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
0,

2
libnm/nm-device-ethernet.c
View file

@ -319,7 +319,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_veth = NML_DBUS_META_IFACE
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wired = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_WIRED,
nm_device_ethernet_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceEthernet, _priv.carrier),
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",

2
libnm/nm-device-generic.c
View file

@ -133,7 +133,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_generic = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_GENERIC,
nm_device_generic_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
0,

2
libnm/nm-device-infiniband.c
View file

@ -143,7 +143,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_infiniband = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
nm_device_infiniband_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceInfiniband, _priv.carrier),
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",

2
libnm/nm-device-ip-tunnel.c
View file

@ -346,7 +346,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_iptunnel = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL,
nm_device_ip_tunnel_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_Y("EncapsulationLimit",
PROP_ENCAPSULATION_LIMIT,

2
libnm/nm-device-macsec.c
View file

@ -387,7 +387,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_macsec = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_MACSEC,
nm_device_macsec_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_T("CipherSuite",
PROP_CIPHER_SUITE,

2
libnm/nm-device-macvlan.c
View file

@ -210,7 +210,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_macvlan = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_MACVLAN,
nm_device_macvlan_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_S("Mode", PROP_MODE, NMDeviceMacvlan, _priv.mode),
NML_DBUS_META_PROPERTY_INIT_B("NoPromisc",

2
libnm/nm-device-modem.c
View file

@ -262,7 +262,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_modem = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_MODEM,
nm_device_modem_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_S("Apn", PROP_APN, NMDeviceModem, _priv.apn),
NML_DBUS_META_PROPERTY_INIT_U("CurrentCapabilities",

2
libnm/nm-device-olpc-mesh.c
View file

@ -139,7 +139,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_olpcmesh = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH,
nm_device_olpc_mesh_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("ActiveChannel",
PROP_ACTIVE_CHANNEL,

2
libnm/nm-device-ovs-bridge.c
View file

@ -126,7 +126,7 @@ nm_device_ovs_bridge_init(NMDeviceOvsBridge *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsbridge =
NML_DBUS_META_IFACE_INIT_PROP(NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
nm_device_ovs_bridge_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_AO_PROP("Slaves",
PROP_SLAVES,

2
libnm/nm-device-ovs-interface.c
View file

@ -76,7 +76,7 @@ nm_device_ovs_interface_init(NMDeviceOvsInterface *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsinterface =
NML_DBUS_META_IFACE_INIT(NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE,
nm_device_ovs_interface_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, );
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30, );
static void
nm_device_ovs_interface_class_init(NMDeviceOvsInterfaceClass *ovs_interface_class)

2
libnm/nm-device-ovs-port.c
View file

@ -126,7 +126,7 @@ nm_device_ovs_port_init(NMDeviceOvsPort *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsport =
NML_DBUS_META_IFACE_INIT_PROP(NM_DBUS_INTERFACE_DEVICE_OVS_PORT,
nm_device_ovs_port_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_AO_PROP("Slaves",
PROP_SLAVES,

2
libnm/nm-device-ppp.c
View file

@ -30,7 +30,7 @@ nm_device_ppp_init(NMDevicePpp *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ppp =
NML_DBUS_META_IFACE_INIT(NM_DBUS_INTERFACE_DEVICE_PPP,
nm_device_ppp_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, );
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30, );
static void
nm_device_ppp_class_init(NMDevicePppClass *klass)

2
libnm/nm-device-team.c
View file

@ -177,7 +177,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_team = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_TEAM,
nm_device_team_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceTeam, _priv.carrier),
NML_DBUS_META_PROPERTY_INIT_S("Config", PROP_CONFIG, NMDeviceTeam, _priv.config),

2
libnm/nm-device-tun.c
View file

@ -275,7 +275,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_tun = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_TUN,
nm_device_tun_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_X("Group", PROP_GROUP, NMDeviceTun, _priv.group),
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",

2
libnm/nm-device-vlan.c
View file

@ -188,7 +188,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_vlan = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_VLAN,
nm_device_vlan_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceVlan, _priv.carrier),
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",

2
libnm/nm-device-vrf.c
View file

@ -108,7 +108,7 @@ nm_device_vrf_init(NMDeviceVrf *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_vrf = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_VRF,
nm_device_vrf_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("Table", PROP_TABLE, NMDeviceVrf, _priv.table), ), );

2
libnm/nm-device-vxlan.c
View file

@ -486,7 +486,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_vxlan = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_VXLAN,
nm_device_vxlan_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("Ageing", PROP_AGEING, NMDeviceVxlan, _priv.ageing),
NML_DBUS_META_PROPERTY_INIT_Q("DstPort", PROP_DST_PORT, NMDeviceVxlan, _priv.dst_port),

2
libnm/nm-device-wifi-p2p.c
View file

@ -325,7 +325,7 @@ nm_device_wifi_p2p_init(NMDeviceWifiP2P *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wifip2p = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_WIFI_P2P,
nm_device_wifi_p2p_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
0,

2
libnm/nm-device-wifi.c
View file

@ -604,7 +604,7 @@ finalize(GObject *object)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wireless = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_WIRELESS,
nm_device_wifi_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_AO_PROP("AccessPoints",
PROP_ACCESS_POINTS,

2
libnm/nm-device-wireguard.c
View file

@ -131,7 +131,7 @@ finalize(GObject *object)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wireguard = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_WIREGUARD,
nm_device_wireguard_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("FwMark", PROP_FWMARK, NMDeviceWireGuard, _priv.fwmark),
NML_DBUS_META_PROPERTY_INIT_Q("ListenPort",

2
libnm/nm-device-wpan.c
View file

@ -76,7 +76,7 @@ nm_device_wpan_init(NMDeviceWpan *device)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_wpan = NML_DBUS_META_IFACE_INIT(
NM_DBUS_INTERFACE_DEVICE_WPAN,
nm_device_wpan_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress",
0,

4
libnm/nm-dhcp-config.c
View file

@ -102,7 +102,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_dhcp4config = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DHCP4_CONFIG,
nm_dhcp4_config_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("Options",
PROP_OPTIONS,
@ -113,7 +113,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_dhcp4config = NML_DBUS_META_IFACE
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_dhcp6config = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DHCP6_CONFIG,
nm_dhcp6_config_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("Options",
PROP_OPTIONS,

4
libnm/nm-ip-config.c
View file

@ -316,7 +316,7 @@ finalize(GObject *object)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_ip4config = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_IP4_CONFIG,
nm_ip4_config_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("AddressData",
PROP_ADDRESSES,
@ -364,7 +364,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_ip4config = NML_DBUS_META_IFACE_I
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_ip6config = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_IP6_CONFIG,
nm_ip6_config_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_FCN("AddressData",
PROP_ADDRESSES,

14
libnm/nm-libnm-utils.h
View file

@ -220,11 +220,11 @@ typedef enum {
/* See comments below for NMLDBusMetaIface.interface_prio.
*
* Higher numbers means more important to detect the GObject type. */
NML_DBUS_META_INTERFACE_PRIO_NONE = 0,
NML_DBUS_META_INTERFACE_PRIO_NMCLIENT = 1,
NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE = 2,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW = 3,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH = 4,
NML_DBUS_META_INTERFACE_PRIO_NONE = 0,
NML_DBUS_META_INTERFACE_PRIO_NMCLIENT = 1,
NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE = 2,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10 = 3,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30 = 4,
} NMLDBusMetaInteracePrio;
/*****************************************************************************/
@ -514,7 +514,7 @@ struct _NMLDBusMetaIface {
* NetworkManager's API does not add/remove interfaces after exporting the object the
* first time, so in practice each D-Bus object is expected to have a suitable D-Bus
* interface (and only determining interface, which doesn't change). Those interfaces have
* priority %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH.
* priority %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30.
*
* (*) note that nothing bad would happen if a faulty NetworkManager would violate that.
* Of course, something would not work correctly, but the D-Bus interface we find is unexpected
@ -522,7 +522,7 @@ struct _NMLDBusMetaIface {
*
* One exception is "org.freedesktop.NetworkManager.Connection.Active". This can either
* be a NMActiveConnection or a NMVpnConnection. Hence, this profile has priority
* %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW, and depending on whether there is
* %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10, and depending on whether there is
* a "org.freedesktop.NetworkManager.VPN.Connection" (with high priority), we create
* one or the other type.
*/

2
libnm/nm-remote-connection.c
View file

@ -746,7 +746,7 @@ dispose(GObject *object)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_settings_connection = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_SETTINGS_CONNECTION,
nm_remote_connection_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_S("Filename",
PROP_FILENAME,

2
libnm/nm-vpn-connection.c
View file

@ -159,7 +159,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_vpn_connection = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_VPN_CONNECTION,
nm_vpn_connection_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_S("Banner", PROP_BANNER, NMVpnConnection, _priv.banner),
NML_DBUS_META_PROPERTY_INIT_U("VpnState",

2
libnm/nm-wifi-p2p-peer.c
View file

@ -402,7 +402,7 @@ finalize(GObject *object)
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_wifip2ppeer = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_WIFI_P2P_PEER,
nm_wifi_p2p_peer_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_U("Flags", PROP_FLAGS, NMWifiP2PPeer, _priv.flags),
NML_DBUS_META_PROPERTY_INIT_IGNORE("Groups", "as"),

76
libnm/tests/test-libnm.c
View file

@ -2824,8 +2824,8 @@ test_nml_dbus_meta(void)
g_assert(NM_IN_SET((NMLDBusMetaInteracePrio) mif->interface_prio,
NML_DBUS_META_INTERFACE_PRIO_NMCLIENT,
NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH));
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30));
g_assert(mif->get_type_fcn);
gtype = mif->get_type_fcn();
@ -3128,172 +3128,172 @@ test_dbus_meta_types(void)
{
NM_DBUS_INTERFACE_ACCESS_POINT,
NM_TYPE_ACCESS_POINT,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
NM_TYPE_ACTIVE_CONNECTION,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10,
}, /* otherwise, NM_TYPE_VPN_CONNECTION. */
{
NM_DBUS_INTERFACE_DEVICE_6LOWPAN,
NM_TYPE_DEVICE_6LOWPAN,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_ADSL,
NM_TYPE_DEVICE_ADSL,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_BOND,
NM_TYPE_DEVICE_BOND,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_BRIDGE,
NM_TYPE_DEVICE_BRIDGE,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
NM_TYPE_DEVICE_BT,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_DUMMY,
NM_TYPE_DEVICE_DUMMY,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_WIRED,
NM_TYPE_DEVICE_ETHERNET,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_GENERIC,
NM_TYPE_DEVICE_GENERIC,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
NM_TYPE_DEVICE_INFINIBAND,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL,
NM_TYPE_DEVICE_IP_TUNNEL,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_MACSEC,
NM_TYPE_DEVICE_MACSEC,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_MACVLAN,
NM_TYPE_DEVICE_MACVLAN,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_MODEM,
NM_TYPE_DEVICE_MODEM,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH,
NM_TYPE_DEVICE_OLPC_MESH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE,
NM_TYPE_DEVICE_OVS_INTERFACE,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_OVS_PORT,
NM_TYPE_DEVICE_OVS_PORT,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
NM_TYPE_DEVICE_OVS_BRIDGE,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_WIFI_P2P,
NM_TYPE_DEVICE_WIFI_P2P,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_PPP,
NM_TYPE_DEVICE_PPP,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_TEAM,
NM_TYPE_DEVICE_TEAM,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_TUN,
NM_TYPE_DEVICE_TUN,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_VLAN,
NM_TYPE_DEVICE_VLAN,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_WPAN,
NM_TYPE_DEVICE_WPAN,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_VXLAN,
NM_TYPE_DEVICE_VXLAN,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_WIRELESS,
NM_TYPE_DEVICE_WIFI,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DEVICE_WIREGUARD,
NM_TYPE_DEVICE_WIREGUARD,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DHCP4_CONFIG,
NM_TYPE_DHCP4_CONFIG,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_DHCP6_CONFIG,
NM_TYPE_DHCP6_CONFIG,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_IP4_CONFIG,
NM_TYPE_IP4_CONFIG,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_IP6_CONFIG,
NM_TYPE_IP6_CONFIG,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_WIFI_P2P_PEER,
NM_TYPE_WIFI_P2P_PEER,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_SETTINGS_CONNECTION,
NM_TYPE_REMOTE_CONNECTION,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_SETTINGS,
@ -3308,12 +3308,12 @@ test_dbus_meta_types(void)
{
NM_DBUS_INTERFACE_VPN_CONNECTION,
NM_TYPE_VPN_CONNECTION,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
{
NM_DBUS_INTERFACE_CHECKPOINT,
NM_TYPE_CHECKPOINT,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
},
};
guint i;