diff options
| author | Michael Biebl <biebl@debian.org> | 2023-02-10 11:51:50 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-02-10 11:51:50 +0100 |
| commit | 58dddb802071d967ff5731f3333239ead78248e8 (patch) | |
| tree | def9e578e4786f8cbc56ce1b6cabf7670e00ae81 /src/libnm-platform/wifi | |
| parent | 2c1b7a7ea3c332b4d690c0595ef76c81de1f0cc8 (diff) | |
| parent | 1372848511cb896b80b51ed1a3e9606bd9816631 (diff) | |
Update upstream source from tag 'upstream/1.42.0'
Update to upstream version '1.42.0' with Debian dir 2b9fa2718b2bd34fa58008e335a0d81b87ad57cf
Diffstat (limited to 'src/libnm-platform/wifi')
| -rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils-nl80211.h | 2 | ||||
| -rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils-wext.c | 2 | ||||
| -rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils-wext.h | 2 | ||||
| -rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.h b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.h index 4783c572..094c0ff0 100644 --- a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.h +++ b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.h @@ -12,7 +12,7 @@ #define NM_TYPE_WIFI_UTILS_NL80211 (nm_wifi_utils_nl80211_get_type()) #define NM_WIFI_UTILS_NL80211(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211)) + (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211)) #define NM_WIFI_UTILS_NL80211_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211Class)) #define NM_IS_WIFI_UTILS_NL80211(obj) \ diff --git a/src/libnm-platform/wifi/nm-wifi-utils-wext.c b/src/libnm-platform/wifi/nm-wifi-utils-wext.c index 678d71fe..eac3c929 100644 --- a/src/libnm-platform/wifi/nm-wifi-utils-wext.c +++ b/src/libnm-platform/wifi/nm-wifi-utils-wext.c @@ -90,7 +90,7 @@ dispose(GObject *object) { NMWifiUtilsWext *wext = NM_WIFI_UTILS_WEXT(object); - wext->fd = nm_close(wext->fd); + nm_clear_fd(&wext->fd); } static gboolean diff --git a/src/libnm-platform/wifi/nm-wifi-utils-wext.h b/src/libnm-platform/wifi/nm-wifi-utils-wext.h index d6f3453c..28a74eba 100644 --- a/src/libnm-platform/wifi/nm-wifi-utils-wext.h +++ b/src/libnm-platform/wifi/nm-wifi-utils-wext.h @@ -10,7 +10,7 @@ #define NM_TYPE_WIFI_UTILS_WEXT (nm_wifi_utils_wext_get_type()) #define NM_WIFI_UTILS_WEXT(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWext)) + (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWext)) #define NM_WIFI_UTILS_WEXT_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWextClass)) #define NM_IS_WIFI_UTILS_WEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_WIFI_UTILS_WEXT)) diff --git a/src/libnm-platform/wifi/nm-wifi-utils.h b/src/libnm-platform/wifi/nm-wifi-utils.h index fd636418..aa5a34cd 100644 --- a/src/libnm-platform/wifi/nm-wifi-utils.h +++ b/src/libnm-platform/wifi/nm-wifi-utils.h @@ -13,7 +13,7 @@ typedef struct NMWifiUtils NMWifiUtils; #define NM_TYPE_WIFI_UTILS (nm_wifi_utils_get_type()) -#define NM_WIFI_UTILS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS, NMWifiUtils)) +#define NM_WIFI_UTILS(obj) (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS, NMWifiUtils)) #define NM_WIFI_UTILS_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIFI_UTILS, NMWifiUtilsClass)) #define NM_IS_WIFI_UTILS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_WIFI_UTILS)) |