From 1372848511cb896b80b51ed1a3e9606bd9816631 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 11:50:34 +0100 Subject: New upstream version 1.42.0 --- src/libnmc-base/nm-polkit-listener.h | 2 +- src/libnmc-base/nm-secret-agent-simple.h | 2 +- src/libnmc-base/nm-vpn-helpers.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libnmc-base') diff --git a/src/libnmc-base/nm-polkit-listener.h b/src/libnmc-base/nm-polkit-listener.h index 8a4c6c38..15decbe1 100644 --- a/src/libnmc-base/nm-polkit-listener.h +++ b/src/libnmc-base/nm-polkit-listener.h @@ -17,7 +17,7 @@ typedef struct _NMPolkitListenerClass NMPolkitListenerClass; #define NM_TYPE_POLKIT_LISTENER (nm_polkit_listener_get_type()) #define NM_POLKIT_LISTENER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListener)) + (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListener)) #define NM_POLKIT_LISTENER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_POLKIT_LISTENER, NMPolkitListenerClass)) #define NM_IS_POLKIT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_POLKIT_LISTENER)) diff --git a/src/libnmc-base/nm-secret-agent-simple.h b/src/libnmc-base/nm-secret-agent-simple.h index 7193f7e5..a1d15881 100644 --- a/src/libnmc-base/nm-secret-agent-simple.h +++ b/src/libnmc-base/nm-secret-agent-simple.h @@ -33,7 +33,7 @@ typedef struct { #define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type()) #define NM_SECRET_AGENT_SIMPLE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) + (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) #define NM_SECRET_AGENT_SIMPLE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) #define NM_IS_SECRET_AGENT_SIMPLE(obj) \ diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c index 7ad5bee5..476fbe51 100644 --- a/src/libnmc-base/nm-vpn-helpers.c +++ b/src/libnmc-base/nm-vpn-helpers.c @@ -199,13 +199,13 @@ nm_vpn_openconnect_authenticate_helper(const char *host, const char *const *iter; const char *path; const char *const DEFAULT_PATHS[] = { - "/sbin/", - "/usr/sbin/", - "/usr/local/sbin/", - "/bin/", - "/usr/bin/", - "/usr/local/bin/", - NULL, + "/sbin/", + "/usr/sbin/", + "/usr/local/sbin/", + "/bin/", + "/usr/bin/", + "/usr/local/bin/", + NULL, }; path = nm_utils_file_search_in_paths("openconnect", -- cgit 1.3.0-6-gf8a5