colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: mark more synchronous libnm API as deprecated

Browse Source 
This is a follow-up to commit e90684a169 ('libnm: deprecate
synchronous/blocking API in libnm') to mark more of such synchronous
API as deprecated.
This commit is contained in:
Thomas Haller
2019-10-04 16:48:39 +02:00
parent 194443237a
commit d80af0225e
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libnm/nm-client.c
View File

@@ -577,6 +577,8 @@ nm_client_connectivity_check_get_uri (NMClient *client)
* Gets NetworkManager current logging level and domains. * Gets NetworkManager current logging level and domains.
* *
* Returns: %TRUE on success, %FALSE otherwise * Returns: %TRUE on success, %FALSE otherwise
*
* Deprecated: 1.22, use nm_client_get_logging_async() or GDBusConnection
**/ **/
gboolean gboolean
nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error) 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 (domains == NULL || *domains == NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == 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)) if (!_nm_client_check_nm_running (client, error))
return FALSE; return FALSE;
@@ -604,6 +608,8 @@ nm_client_get_logging (NMClient *client, char **level, char **domains, GError **
* Sets NetworkManager logging level and/or domains. * Sets NetworkManager logging level and/or domains.
* *
* Returns: %TRUE on success, %FALSE otherwise * Returns: %TRUE on success, %FALSE otherwise
*
* Deprecated: 1.22, use nm_client_set_logging_async() or GDBusConnection
**/ **/
gboolean gboolean
nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error) 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 (NM_IS_CLIENT (client), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, 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)) if (!_nm_client_check_nm_running (client, error))
return FALSE; return FALSE;

3
libnm/nm-client.h
View File

@@ -277,10 +277,13 @@ void nm_client_connectivity_check_set_enabled (NMClient *client,
NM_AVAILABLE_IN_1_20 NM_AVAILABLE_IN_1_20
const char *nm_client_connectivity_check_get_uri (NMClient *client); const char *nm_client_connectivity_check_get_uri (NMClient *client);
_NM_DEPRECATED_SYNC_METHOD
gboolean nm_client_get_logging (NMClient *client, gboolean nm_client_get_logging (NMClient *client,
char **level, char **level,
char **domains, char **domains,
GError **error); GError **error);
_NM_DEPRECATED_SYNC_METHOD
gboolean nm_client_set_logging (NMClient *client, gboolean nm_client_set_logging (NMClient *client,
const char *level, const char *level,
const char *domains, const char *domains,

3
libnm/nm-manager.h
View File

@@ -112,10 +112,13 @@ void nm_manager_connectivity_check_set_enabled (NMManager *manager,
const char *nm_manager_connectivity_check_get_uri (NMManager *manager); const char *nm_manager_connectivity_check_get_uri (NMManager *manager);
_NM_DEPRECATED_SYNC_METHOD_INTERNAL
gboolean nm_manager_get_logging (NMManager *manager, gboolean nm_manager_get_logging (NMManager *manager,
char **level, char **level,
char **domains, char **domains,
GError **error); GError **error);
_NM_DEPRECATED_SYNC_METHOD_INTERNAL
gboolean nm_manager_set_logging (NMManager *manager, gboolean nm_manager_set_logging (NMManager *manager,
const char *level, const char *level,
const char *domains, const char *domains,