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

libnm: implement nm_client_save_hostname() by using GDBusConnection directly

Browse Source
This commit is contained in:
Thomas Haller
2019-10-07 09:39:34 +02:00
parent 356f1f6f33
commit c92eb66d38
3 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libnm/nm-client.c
View File

@@ -882,12 +882,18 @@ nm_client_save_hostname (NMClient *client,
GError **error) GError **error)
{ {
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 (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE);
if (!_nm_client_check_nm_running (client, error)) return _nm_object_dbus_call_sync_void (client,
return FALSE; cancellable,
NM_DBUS_PATH_SETTINGS,
return nm_remote_settings_save_hostname (NM_CLIENT_GET_PRIVATE (client)->settings, NM_DBUS_INTERFACE_SETTINGS,
hostname, cancellable, error); "SaveHostname",
g_variant_new ("(s)", hostname ?: ""),
G_DBUS_CALL_FLAGS_NONE,
NM_DBUS_DEFAULT_TIMEOUT_MSEC,
TRUE,
error);
} }
static void static void

21
libnm/nm-remote-settings.c
View File

@@ -394,27 +394,6 @@ nm_remote_settings_add_connection2 (NMRemoteSettings *self,
} }
} }
gboolean
nm_remote_settings_save_hostname (NMRemoteSettings *settings,
const char *hostname,
GCancellable *cancellable,
GError **error)
{
NMRemoteSettingsPrivate *priv;
gboolean ret;
g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE);
priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings);
ret = nmdbus_settings_call_save_hostname_sync (priv->proxy,
hostname ?: "",
cancellable, error);
if (error && *error)
g_dbus_error_strip_remote_error (*error);
return ret;
}
static void static void
save_hostname_cb (GObject *proxy, save_hostname_cb (GObject *proxy,
GAsyncResult *result, GAsyncResult *result,

6
libnm/nm-remote-settings.h
View File

@@ -75,12 +75,6 @@ void nm_remote_settings_add_connection2 (NMRemoteSettings *self,
NMRemoteSettingAddConnection2Callback callback, NMRemoteSettingAddConnection2Callback callback,
gpointer user_data); gpointer user_data);
_NM_DEPRECATED_SYNC_METHOD_INTERNAL
gboolean nm_remote_settings_save_hostname (NMRemoteSettings *settings,
const char *hostname,
GCancellable *cancellable,
GError **error);
void nm_remote_settings_save_hostname_async (NMRemoteSettings *settings, void nm_remote_settings_save_hostname_async (NMRemoteSettings *settings,
const char *hostname, const char *hostname,
GCancellable *cancellable, GCancellable *cancellable,