summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-10-27 14:05:36 +0200
committerThomas Haller <thaller@redhat.com>2022-10-27 15:18:54 +0200
commit3a8decd9cf669fba6b76a2ac463202828d9831ec (patch)
tree26b0b8714ab9cdc8b959465540f5787da094b880
parent37ab511ed4b1538d62fc9dac40b6a2bccb8247d3 (diff)
downloadNetworkManager-3a8decd9cf669fba6b76a2ac463202828d9831ec.tar.gz
hostname: rename nm_hostname_manager_write_hostname() to set_static_hostname()
-rw-r--r--src/core/nm-hostname-manager.c25
-rw-r--r--src/core/nm-hostname-manager.h18
-rw-r--r--src/core/settings/nm-settings.c4
3 files changed, 25 insertions, 22 deletions
diff --git a/src/core/nm-hostname-manager.c b/src/core/nm-hostname-manager.c
index ba0c6c9dee..26e073b36e 100644
--- a/src/core/nm-hostname-manager.c
+++ b/src/core/nm-hostname-manager.c
@@ -433,11 +433,11 @@ _write_hostname_on_idle_cb(gpointer user_data, GCancellable *cancellable)
}
void
-nm_hostname_manager_write_hostname(NMHostnameManager *self,
- const char *hostname,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+nm_hostname_manager_set_static_hostname(NMHostnameManager *self,
+ const char *hostname,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
NMHostnameManagerPrivate *priv;
GTask *task;
@@ -446,8 +446,11 @@ nm_hostname_manager_write_hostname(NMHostnameManager *self,
priv = NM_HOSTNAME_MANAGER_GET_PRIVATE(self);
- task =
- nm_g_task_new(self, cancellable, nm_hostname_manager_write_hostname, callback, user_data);
+ task = nm_g_task_new(self,
+ cancellable,
+ nm_hostname_manager_set_static_hostname,
+ callback,
+ user_data);
g_task_set_task_data(task, g_strdup(hostname), g_free);
@@ -467,12 +470,12 @@ nm_hostname_manager_write_hostname(NMHostnameManager *self,
}
gboolean
-nm_hostname_manager_write_hostname_finish(NMHostnameManager *self,
- GAsyncResult *result,
- GError **error)
+nm_hostname_manager_set_static_hostname_finish(NMHostnameManager *self,
+ GAsyncResult *result,
+ GError **error)
{
g_return_val_if_fail(NM_IS_HOSTNAME_MANAGER(self), FALSE);
- g_return_val_if_fail(nm_g_task_is_valid(result, self, nm_hostname_manager_write_hostname),
+ g_return_val_if_fail(nm_g_task_is_valid(result, self, nm_hostname_manager_set_static_hostname),
FALSE);
return g_task_propagate_boolean(G_TASK(result), error);
diff --git a/src/core/nm-hostname-manager.h b/src/core/nm-hostname-manager.h
index 31596819ae..1d6cbc1057 100644
--- a/src/core/nm-hostname-manager.h
+++ b/src/core/nm-hostname-manager.h
@@ -36,15 +36,15 @@ NMHostnameManager *nm_hostname_manager_get(void);
const char *nm_hostname_manager_get_static_hostname(NMHostnameManager *self);
-void nm_hostname_manager_write_hostname(NMHostnameManager *self,
- const char *hostname,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean nm_hostname_manager_write_hostname_finish(NMHostnameManager *self,
- GAsyncResult *result,
- GError **error);
+void nm_hostname_manager_set_static_hostname(NMHostnameManager *self,
+ const char *hostname,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean nm_hostname_manager_set_static_hostname_finish(NMHostnameManager *self,
+ GAsyncResult *result,
+ GError **error);
void nm_hostname_manager_set_transient_hostname(NMHostnameManager *self,
const char *hostname,
diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c
index b7d846c6d7..63476c3c94 100644
--- a/src/core/settings/nm-settings.c
+++ b/src/core/settings/nm-settings.c
@@ -3479,7 +3479,7 @@ _save_hostname_write_cb(GObject *source, GAsyncResult *result, gpointer user_dat
nm_utils_user_data_unpack(user_data, &self, &context, &auth_subject, &hostname, &cancellable);
- nm_hostname_manager_write_hostname_finish(NM_HOSTNAME_MANAGER(source), result, &error);
+ nm_hostname_manager_set_static_hostname_finish(NM_HOSTNAME_MANAGER(source), result, &error);
nm_audit_log_control_op(NM_AUDIT_OP_HOSTNAME_SAVE,
hostname ?: "",
@@ -3544,7 +3544,7 @@ _save_hostname_pk_cb(NMAuthChain *chain, GDBusMethodInvocation *context, gpointe
(gpointer *) &priv->shutdown_cancellable);
}
- nm_hostname_manager_write_hostname(
+ nm_hostname_manager_set_static_hostname(
priv->hostname_manager,
hostname,
priv->shutdown_cancellable,