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

libnm-util: only emit one CHANGED signal when adding several settings

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2013-12-11 17:53:25 +01:00
parent 123bf9eea4
commit ff6315cbab
1 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
libnm-util/nm-connection.c
View File

@@ -183,6 +183,16 @@ setting_changed_cb (NMSetting *setting,
g_signal_emit (self, signals[CHANGED], 0); g_signal_emit (self, signals[CHANGED], 0);
} }
static void
_nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
{
g_hash_table_insert (NM_CONNECTION_GET_PRIVATE (connection)->settings,
(gpointer) G_OBJECT_TYPE_NAME (setting),
setting);
/* Listen for property changes so we can emit the 'changed' signal */
g_signal_connect (setting, "notify", (GCallback) setting_changed_cb, connection);
}
/** /**
* nm_connection_add_setting: * nm_connection_add_setting:
* @connection: a #NMConnection * @connection: a #NMConnection
@@ -199,12 +209,7 @@ nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
g_return_if_fail (NM_IS_CONNECTION (connection)); g_return_if_fail (NM_IS_CONNECTION (connection));
g_return_if_fail (NM_IS_SETTING (setting)); g_return_if_fail (NM_IS_SETTING (setting));
g_hash_table_insert (NM_CONNECTION_GET_PRIVATE (connection)->settings, _nm_connection_add_setting (connection, setting);
(gpointer) G_OBJECT_TYPE_NAME (setting),
setting);
/* Listen for property changes so we can emit the 'changed' signal */
g_signal_connect (setting, "notify", (GCallback) setting_changed_cb, connection);
g_signal_emit (connection, signals[CHANGED], 0); g_signal_emit (connection, signals[CHANGED], 0);
} }
@@ -336,19 +341,30 @@ hash_to_connection (NMConnection *connection, GHashTable *new, GError **error)
GHashTableIter iter; GHashTableIter iter;
const char *setting_name; const char *setting_name;
GHashTable *setting_hash; GHashTable *setting_hash;
NMSetting *setting = NULL; gboolean changed, valid;
GType type; NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
if ((changed = g_hash_table_size (priv->settings) > 0))
g_hash_table_remove_all (priv->settings);
g_hash_table_remove_all (NM_CONNECTION_GET_PRIVATE (connection)->settings);
g_hash_table_iter_init (&iter, new); g_hash_table_iter_init (&iter, new);
while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting_hash)) { while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting_hash)) {
type = nm_connection_lookup_setting_type (setting_name); GType type = nm_connection_lookup_setting_type (setting_name);
if (type)
setting = nm_setting_new_from_hash (type, setting_hash); if (type) {
if (setting) NMSetting *setting = nm_setting_new_from_hash (type, setting_hash);
nm_connection_add_setting (connection, setting);
if (setting) {
_nm_connection_add_setting (connection, setting);
changed = TRUE;
} }
return nm_connection_verify (connection, error); }
}
valid = nm_connection_verify (connection, error);
if (changed)
g_signal_emit (connection, signals[CHANGED], 0);
return valid;
} }
/** /**
@@ -372,10 +388,8 @@ nm_connection_replace_settings (NMConnection *connection,
if (error) if (error)
g_return_val_if_fail (*error == NULL, FALSE); g_return_val_if_fail (*error == NULL, FALSE);
if (validate_permissions_type (new_settings, error)) { if (validate_permissions_type (new_settings, error))
valid = hash_to_connection (connection, new_settings, error); valid = hash_to_connection (connection, new_settings, error);
g_signal_emit (connection, signals[CHANGED], 0);
}
return valid; return valid;
} }
@@ -398,8 +412,10 @@ nm_connection_replace_settings_from_connection (NMConnection *connection,
NMConnection *new_connection, NMConnection *new_connection,
GError **error) GError **error)
{ {
NMConnectionPrivate *priv;
GHashTableIter iter; GHashTableIter iter;
NMSetting *setting; NMSetting *setting;
gboolean changed, valid;
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (new_connection), FALSE); g_return_val_if_fail (NM_IS_CONNECTION (new_connection), FALSE);
@@ -414,16 +430,22 @@ nm_connection_replace_settings_from_connection (NMConnection *connection,
/* No need to validate permissions like nm_connection_replace_settings() /* No need to validate permissions like nm_connection_replace_settings()
* since we're dealing with an NMConnection which has already done that. * since we're dealing with an NMConnection which has already done that.
*/ */
g_hash_table_remove_all (NM_CONNECTION_GET_PRIVATE (connection)->settings);
priv = NM_CONNECTION_GET_PRIVATE (connection);
if ((changed = g_hash_table_size (priv->settings) > 0))
g_hash_table_remove_all (priv->settings);
if (g_hash_table_size (NM_CONNECTION_GET_PRIVATE (new_connection)->settings)) { if (g_hash_table_size (NM_CONNECTION_GET_PRIVATE (new_connection)->settings)) {
g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (new_connection)->settings); g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (new_connection)->settings);
while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting))
nm_connection_add_setting (connection, nm_setting_duplicate (setting)); _nm_connection_add_setting (connection, nm_setting_duplicate (setting));
} else changed = TRUE;
g_signal_emit (connection, signals[CHANGED], 0); }
return nm_connection_verify (connection, error); valid = nm_connection_verify (connection, error);
if (changed)
g_signal_emit (connection, signals[CHANGED], 0);
return valid;
} }
/** /**