From d80af0225e90528dd4cf9d01cf91dc22d15aaec8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 4 Oct 2019 16:48:39 +0200 Subject: [PATCH] libnm: mark more synchronous libnm API as deprecated This is a follow-up to commit e90684a169a7 ('libnm: deprecate synchronous/blocking API in libnm') to mark more of such synchronous API as deprecated. --- libnm/nm-client.c | 8 ++++++++ libnm/nm-client.h | 3 +++ libnm/nm-manager.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/libnm/nm-client.c b/libnm/nm-client.c index fd6c35dca..d5ae5d4ac 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -577,6 +577,8 @@ nm_client_connectivity_check_get_uri (NMClient *client) * Gets NetworkManager current logging level and domains. * * Returns: %TRUE on success, %FALSE otherwise + * + * Deprecated: 1.22, use nm_client_get_logging_async() or GDBusConnection **/ gboolean nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error) @@ -586,6 +588,8 @@ nm_client_get_logging (NMClient *client, char **level, char **domains, GError ** g_return_val_if_fail (domains == NULL || *domains == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + /* FIXME(libnm-async-api): add nm_client_get_logging_async(). */ + if (!_nm_client_check_nm_running (client, error)) return FALSE; @@ -604,6 +608,8 @@ nm_client_get_logging (NMClient *client, char **level, char **domains, GError ** * Sets NetworkManager logging level and/or domains. * * Returns: %TRUE on success, %FALSE otherwise + * + * Deprecated: 1.22, use nm_client_set_logging_async() or GDBusConnection **/ gboolean nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error) @@ -611,6 +617,8 @@ nm_client_set_logging (NMClient *client, const char *level, const char *domains, g_return_val_if_fail (NM_IS_CLIENT (client), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + /* FIXME(libnm-async-api): add nm_client_set_logging_async(). */ + if (!_nm_client_check_nm_running (client, error)) return FALSE; diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 0b3b0e36e..32cbd168a 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -277,10 +277,13 @@ void nm_client_connectivity_check_set_enabled (NMClient *client, NM_AVAILABLE_IN_1_20 const char *nm_client_connectivity_check_get_uri (NMClient *client); +_NM_DEPRECATED_SYNC_METHOD gboolean nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error); + +_NM_DEPRECATED_SYNC_METHOD gboolean nm_client_set_logging (NMClient *client, const char *level, const char *domains, diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h index 9b46b6417..e9c09c62c 100644 --- a/libnm/nm-manager.h +++ b/libnm/nm-manager.h @@ -112,10 +112,13 @@ void nm_manager_connectivity_check_set_enabled (NMManager *manager, const char *nm_manager_connectivity_check_get_uri (NMManager *manager); +_NM_DEPRECATED_SYNC_METHOD_INTERNAL gboolean nm_manager_get_logging (NMManager *manager, char **level, char **domains, GError **error); + +_NM_DEPRECATED_SYNC_METHOD_INTERNAL gboolean nm_manager_set_logging (NMManager *manager, const char *level, const char *domains,