diff options
-rw-r--r-- | docs/libnm/Makefile.am | 2 | ||||
-rw-r--r-- | docs/libnm/meson.build | 2 | ||||
-rw-r--r-- | src/libnm-client-public/nm-device-dummy.h | 2 | ||||
-rw-r--r-- | src/libnm-client-public/nm-device-macsec.h | 2 | ||||
-rw-r--r-- | src/libnm-client-public/nm-device-macvlan.h | 2 | ||||
-rw-r--r-- | src/libnm-client-public/nm-device-tun.h | 2 | ||||
-rw-r--r-- | src/libnm-client-public/nm-device-vxlan.h | 2 | ||||
-rw-r--r-- | src/libnm-client-public/nm-device-wifi-p2p.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index c5a64a4fc7..928ea5ee1d 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -24,7 +24,7 @@ DOC_SOURCE_DIR= \ $(NULL) # Extra options to supply to gtkdoc-scan. -SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?" +SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators='NM_AVAILABLE_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+_FOR\(\)' # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 5d332e5042..5e742b6c3e 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -29,7 +29,7 @@ private_headers = [ scan_args = [ '--rebuild-types', '--rebuild-sections', - '--ignore-decorators=NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?', + '--ignore-decorators=NM_AVAILABLE_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+_FOR\(\)', '--ignore-headers=' + ' '.join(private_headers), ] diff --git a/src/libnm-client-public/nm-device-dummy.h b/src/libnm-client-public/nm-device-dummy.h index 0e6c6fe6c3..f869d0f668 100644 --- a/src/libnm-client-public/nm-device-dummy.h +++ b/src/libnm-client-public/nm-device-dummy.h @@ -36,8 +36,8 @@ typedef struct _NMDeviceDummyClass NMDeviceDummyClass; GType nm_device_dummy_get_type(void); -NM_AVAILABLE_IN_1_10 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) +NM_AVAILABLE_IN_1_10 const char *nm_device_dummy_get_hw_address(NMDeviceDummy *device); G_END_DECLS diff --git a/src/libnm-client-public/nm-device-macsec.h b/src/libnm-client-public/nm-device-macsec.h index 32187b7a40..307233d28b 100644 --- a/src/libnm-client-public/nm-device-macsec.h +++ b/src/libnm-client-public/nm-device-macsec.h @@ -53,8 +53,8 @@ GType nm_device_macsec_get_type(void); NM_AVAILABLE_IN_1_42 NMDevice *nm_device_macsec_get_parent(NMDeviceMacsec *device); -NM_AVAILABLE_IN_1_6 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) +NM_AVAILABLE_IN_1_6 const char *nm_device_macsec_get_hw_address(NMDeviceMacsec *device); NM_AVAILABLE_IN_1_6 diff --git a/src/libnm-client-public/nm-device-macvlan.h b/src/libnm-client-public/nm-device-macvlan.h index 852920692e..432a720663 100644 --- a/src/libnm-client-public/nm-device-macvlan.h +++ b/src/libnm-client-public/nm-device-macvlan.h @@ -50,8 +50,8 @@ gboolean nm_device_macvlan_get_no_promisc(NMDeviceMacvlan *device); NM_AVAILABLE_IN_1_2 gboolean nm_device_macvlan_get_tap(NMDeviceMacvlan *device); -NM_AVAILABLE_IN_1_2 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) +NM_AVAILABLE_IN_1_2 const char *nm_device_macvlan_get_hw_address(NMDeviceMacvlan *device); G_END_DECLS diff --git a/src/libnm-client-public/nm-device-tun.h b/src/libnm-client-public/nm-device-tun.h index 4269035887..97b01d5fdb 100644 --- a/src/libnm-client-public/nm-device-tun.h +++ b/src/libnm-client-public/nm-device-tun.h @@ -42,8 +42,8 @@ typedef struct _NMDeviceTunClass NMDeviceTunClass; NM_AVAILABLE_IN_1_2 GType nm_device_tun_get_type(void); -NM_AVAILABLE_IN_1_2 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) +NM_AVAILABLE_IN_1_2 const char *nm_device_tun_get_hw_address(NMDeviceTun *device); NM_AVAILABLE_IN_1_2 diff --git a/src/libnm-client-public/nm-device-vxlan.h b/src/libnm-client-public/nm-device-vxlan.h index 1de1494b0b..2024801f6f 100644 --- a/src/libnm-client-public/nm-device-vxlan.h +++ b/src/libnm-client-public/nm-device-vxlan.h @@ -54,8 +54,8 @@ typedef struct _NMDeviceVxlanClass NMDeviceVxlanClass; NM_AVAILABLE_IN_1_2 GType nm_device_vxlan_get_type(void); -NM_AVAILABLE_IN_1_2 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) +NM_AVAILABLE_IN_1_2 const char *nm_device_vxlan_get_hw_address(NMDeviceVxlan *device); NM_AVAILABLE_IN_1_42 diff --git a/src/libnm-client-public/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h index ecdb3b5579..44b59ccf5b 100644 --- a/src/libnm-client-public/nm-device-wifi-p2p.h +++ b/src/libnm-client-public/nm-device-wifi-p2p.h @@ -40,8 +40,8 @@ typedef struct _NMDeviceWifiP2PClass NMDeviceWifiP2PClass; NM_AVAILABLE_IN_1_16 GType nm_device_wifi_p2p_get_type(void); -NM_AVAILABLE_IN_1_16 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address) +NM_AVAILABLE_IN_1_16 const char *nm_device_wifi_p2p_get_hw_address(NMDeviceWifiP2P *device); NM_AVAILABLE_IN_1_42 |