Commit 26eaca89 authored by Thomas Haller's avatar Thomas Haller
Browse files

libnm: drop "_async" suffix from nm_client_add_and_activate_connection_options()

Synchronous D-Bus calls seems harmful to me, such API should not be
added to libnm. As such, all API is by default and preferably "_async".

Don't add an "_async" suffix. While we are not consistent in libnm about
this, I think for new code we should.
parent 1d9a808a
Pipeline #8946 passed with stage
in 7 minutes and 51 seconds
......@@ -1447,7 +1447,7 @@ global:
libnm_1_16_0 {
global:
nm_client_add_and_activate_connection_options_async;
nm_client_add_and_activate_connection_options;
nm_client_add_and_activate_connection_options_finish;
nm_device_get_connectivity;
} libnm_1_14_0;
......@@ -1269,7 +1269,7 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
}
/**
* nm_client_add_and_activate_connection_options_async:
* nm_client_add_and_activate_connection_options:
* @client: a #NMClient
* @partial: (allow-none): an #NMConnection to add; the connection may be
* partially filled (or even %NULL) and will be completed by NetworkManager
......@@ -1314,14 +1314,14 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
* Since: 1.16
**/
void
nm_client_add_and_activate_connection_options_async (NMClient *client,
NMConnection *partial,
NMDevice *device,
const char *specific_object,
GVariant *options,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
nm_client_add_and_activate_connection_options (NMClient *client,
NMConnection *partial,
NMDevice *device,
const char *specific_object,
GVariant *options,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *simple;
GError *error = NULL;
......@@ -1337,7 +1337,7 @@ nm_client_add_and_activate_connection_options_async (NMClient *client,
}
simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data,
nm_client_add_and_activate_connection_options_async);
nm_client_add_and_activate_connection_options);
if (cancellable)
g_simple_async_result_set_check_cancellable (simple, cancellable);
nm_manager_add_and_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->manager,
......@@ -1351,7 +1351,7 @@ nm_client_add_and_activate_connection_options_async (NMClient *client,
* @result: the result passed to the #GAsyncReadyCallback
* @error: location for a #GError, or %NULL
*
* Gets the result of a call to nm_client_add_and_activate_connection_options_async().
* Gets the result of a call to nm_client_add_and_activate_connection_options().
*
* You can call nm_active_connection_get_connection() on the returned
* #NMActiveConnection to find the path of the created #NMConnection.
......
......@@ -340,14 +340,14 @@ NMActiveConnection *nm_client_add_and_activate_connection_finish (NMClient *clie
GError **error);
NM_AVAILABLE_IN_1_16
void nm_client_add_and_activate_connection_options_async (NMClient *client,
NMConnection *partial,
NMDevice *device,
const char *specific_object,
GVariant *options,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
void nm_client_add_and_activate_connection_options (NMClient *client,
NMConnection *partial,
NMDevice *device,
const char *specific_object,
GVariant *options,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
NM_AVAILABLE_IN_1_16
NMActiveConnection *nm_client_add_and_activate_connection_options_finish (NMClient *client,
GAsyncResult *result,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment