Commit 2371ee61 authored by Pavel Šimerda's avatar Pavel Šimerda

trivial: rename nm_settings_add_connection*() functions

It makes more sense to use basic name for the basic function and
suffixed name for the special one.
Acked-by: Dan Williams's avatarDan Williams <dcbw@redhat.com>
parent e0c2b970
......@@ -3369,12 +3369,12 @@ add_and_activate_auth_done (PendingActivation *pending, GError *error)
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (pending->manager);
/* Basic sender auth checks performed; try to add the connection */
nm_settings_add_connection (priv->settings,
pending->connection,
TRUE,
pending->context,
activation_add_done,
pending);
nm_settings_add_connection_dbus (priv->settings,
pending->connection,
TRUE,
pending->context,
activation_add_done,
pending);
}
}
......
......@@ -877,10 +877,10 @@ remove_default_wired_connection (NMSettings *self,
}
NMSettingsConnection *
nm_settings_add_connection_internal (NMSettings *self,
NMConnection *connection,
gboolean save_to_disk,
GError **error)
nm_settings_add_connection (NMSettings *self,
NMConnection *connection,
gboolean save_to_disk,
GError **error)
{
NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
GSList *iter;
......@@ -1007,7 +1007,7 @@ pk_add_cb (NMAuthChain *chain,
connection = nm_auth_chain_get_data (chain, "connection");
g_assert (connection);
save_to_disk = GPOINTER_TO_UINT (nm_auth_chain_get_data (chain, "save-to-disk"));
added = nm_settings_add_connection_internal (self, connection, save_to_disk, &error);
added = nm_settings_add_connection (self, connection, save_to_disk, &error);
}
callback = nm_auth_chain_get_data (chain, "callback");
......@@ -1057,7 +1057,7 @@ is_adhoc_wpa (NMConnection *connection)
}
void
nm_settings_add_connection (NMSettings *self,
nm_settings_add_connection_dbus (NMSettings *self,
NMConnection *connection,
gboolean save_to_disk,
DBusGMethodInvocation *context,
......@@ -1186,7 +1186,7 @@ impl_settings_add_connection_helper (NMSettings *self,
connection = nm_connection_new_from_hash (settings, &error);
if (connection) {
nm_settings_add_connection (self,
nm_settings_add_connection_dbus (self,
connection,
save_to_disk,
context,
......@@ -1456,7 +1456,7 @@ default_wired_try_update (NMDefaultWiredConnection *wired,
g_assert (id);
remove_default_wired_connection (self, NM_SETTINGS_CONNECTION (wired), FALSE);
added = nm_settings_add_connection_internal (self, NM_CONNECTION (wired), TRUE, &error);
added = nm_settings_add_connection (self, NM_CONNECTION (wired), TRUE, &error);
if (added) {
nm_settings_connection_delete (NM_SETTINGS_CONNECTION (wired), delete_cb, NULL);
......
......@@ -92,22 +92,22 @@ typedef void (*NMSettingsAddCallback) (NMSettings *settings,
DBusGMethodInvocation *context,
gpointer user_data);
void nm_settings_add_connection (NMSettings *self,
NMConnection *connection,
gboolean save_to_disk,
DBusGMethodInvocation *context,
NMSettingsAddCallback callback,
gpointer user_data);
void nm_settings_add_connection_dbus (NMSettings *self,
NMConnection *connection,
gboolean save_to_disk,
DBusGMethodInvocation *context,
NMSettingsAddCallback callback,
gpointer user_data);
/* Returns a list of NMSettingsConnections. Caller must free the list with
* g_slist_free().
*/
GSList *nm_settings_get_connections (NMSettings *settings);
NMSettingsConnection *nm_settings_add_connection_internal (NMSettings *settings,
NMConnection *connection,
gboolean save_to_disk,
GError **error);
NMSettingsConnection *nm_settings_add_connection (NMSettings *settings,
NMConnection *connection,
gboolean save_to_disk,
GError **error);
NMSettingsConnection *nm_settings_get_connection_by_path (NMSettings *settings,
const char *path);
......
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