fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 01:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: add helper functions for emitting signals in NMConnection

Browse source 
Not very useful, but it seems nicer to read. They anyway can be
inlined. After all, naming and structure is important and the places
where we emit signals are important. By having well-named helper
functions, these places are easier to find and reason about.

(cherry picked from commit 60957a4c8a)
This commit is contained in:
Thomas Haller 2021-06-15 10:27:29 +02:00
parent bce9de78d9
commit feb262f24d
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/libnm-core-impl/nm-connection.c
View file

@ -148,7 +148,21 @@ _signal_emit_changed(NMConnection *self)
}
static void
setting_changed_cb(NMSetting *setting, GParamSpec *pspec, NMConnection *self)
_signal_emit_secrets_updated(NMConnection *self, const char *setting_name)
{
g_signal_emit(self, signals[SECRETS_UPDATED], 0, setting_name);
}
static void
_signal_emit_secrets_cleared(NMConnection *self)
{
g_signal_emit(self, signals[SECRETS_CLEARED], 0);
}
/*****************************************************************************/
static void
_setting_notify_changed_cb(NMSetting *setting, GParamSpec *pspec, NMConnection *self)
{
_signal_emit_changed(self);
}
@ -156,27 +170,31 @@ setting_changed_cb(NMSetting *setting, GParamSpec *pspec, NMConnection *self)
static void
_setting_notify_connect(NMConnection *connection, NMSetting *setting)
{
g_signal_connect(setting, "notify", (GCallback) setting_changed_cb, connection);
g_signal_connect(setting, "notify", G_CALLBACK(_setting_notify_changed_cb), connection);
}
static void
_setting_notify_disconnect(NMConnection *connection, NMSetting *setting)
{
g_signal_handlers_disconnect_by_func(setting, setting_changed_cb, connection);
g_signal_handlers_disconnect_by_func(setting,
G_CALLBACK(_setting_notify_changed_cb),
connection);
}
static void
_setting_notify_block(NMConnection *connection, NMSetting *setting)
{
g_signal_handlers_block_by_func(setting, (GCallback) setting_changed_cb, connection);
g_signal_handlers_block_by_func(setting, G_CALLBACK(_setting_notify_changed_cb), connection);
}
static void
_setting_notify_unblock(NMConnection *connection, NMSetting *setting)
{
g_signal_handlers_unblock_by_func(setting, (GCallback) setting_changed_cb, connection);
g_signal_handlers_unblock_by_func(setting, G_CALLBACK(_setting_notify_changed_cb), connection);
}
/*****************************************************************************/
static gboolean
_nm_connection_clear_settings(NMConnection *connection, NMConnectionPrivate *priv)
{
@ -2252,7 +2270,7 @@ nm_connection_update_secrets(NMConnection *connection,
}
if (updated)
g_signal_emit(connection, signals[SECRETS_UPDATED], 0, setting_name);
_signal_emit_secrets_updated(connection, setting_name);
return success;
}
@ -2361,7 +2379,7 @@ nm_connection_clear_secrets_with_flags(NMConnection * connecti
_setting_notify_unblock(connection, setting);
}
g_signal_emit(connection, signals[SECRETS_CLEARED], 0);
_signal_emit_secrets_cleared(connection);
}
static gboolean