xxxxxth/libnm-team-fixes-pt2

3 files changed, 29 insertions, 1 deletions

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 6e35228ad6..8b4018865b 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -1055,6 +1055,9 @@ _set_fcn_gobject_bool (ARGS_SET_FCN)
 {
 	gboolean val_bool;
 
+	if (nm_streq (property_info->property_name, NM_SETTING_TEAM_RUNNER_ACTIVE))
+		g_print (">>>team[%p] nmcli set runner-active to \"%s\"\n", setting, value);
+
 	if (!nmc_string_to_bool (value, &val_bool, error))
 		return FALSE;
 
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index e97a07233e..7dd5894170 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -732,6 +732,7 @@ _notify_and_align (NMSettingTeam *self, _PropertyEnums prop_id)
 	if (!_nm_utils_json_append_gvalue (&priv->config, _prop_to_keys[prop_id], &value))
 		return;
 
+	g_print (">>>team[%p] CALL property %s (notify+align)\n", self, obj_properties[prop_id]->name);
 	g_object_freeze_notify (G_OBJECT (self));
 	_align_team_properties (self);
 	_notify (self, prop_id);
@@ -1389,6 +1390,7 @@ _align_team_properties (NMSettingTeam *self)
 	GPtrArray *ptrarr;
 	char **strv;
 	gsize i;
+	bool old;
 
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_int,    self, priv->config, &priv->notify_peers_count,          PROP_NOTIFY_PEERS_COUNT);
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_int,    self, priv->config, &priv->notify_peers_interval,       PROP_NOTIFY_PEERS_INTERVAL);
@@ -1398,7 +1400,9 @@ _align_team_properties (NMSettingTeam *self)
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_int,    self, priv->config, &priv->runner_sys_prio,             PROP_RUNNER_SYS_PRIO);
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_int,    self, priv->config, &priv->runner_min_ports,            PROP_RUNNER_MIN_PORTS);
 
+	old = priv->runner_active;
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_bool,   self, priv->config, &priv->runner_active,               PROP_RUNNER_ACTIVE);
+	g_print (">>> align runner-active: %d -> %d    (%s)\n", old, priv->runner_active, priv->config);
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_bool,   self, priv->config, &priv->runner_fast_rate,            PROP_RUNNER_FAST_RATE);
 
 	_NM_TEAM_ALIGN_PROP (_nm_team_align_prop_string, self, priv->config, &priv->runner,                      PROP_RUNNER);
@@ -1514,6 +1518,7 @@ set_property (GObject *object, guint prop_id,
 	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (object);
 	const char *cstr;
 
+	g_print (">>>team[%p] CALL property %s (set-prop)\n", object, obj_properties[prop_id]->name);
 	switch (prop_id) {
 	case PROP_CONFIG:
 		cstr = g_value_get_string (value);
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index db0f64644c..01e4cf65c2 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -799,7 +799,20 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
 		}
 	}
 
-	return g_variant_builder_end (&builder);
+	{
+		GVariant *v;
+
+		v = g_variant_builder_end (&builder);
+
+		if (nm_streq (nm_setting_get_name (setting), "team")) {
+			gs_free char *ss = NULL;
+
+			g_print (">>> convert %p to D-Bus: %s (runner-active=%d)\n", setting,
+			         (ss = g_variant_print (v, TRUE)),
+			         nm_setting_team_get_runner_active ((gpointer) setting));
+		}
+		return v;
+	}
 }
 
 /**
@@ -853,6 +866,13 @@ _nm_setting_new_from_dbus (GType setting_type,
 	 */
 	setting = (NMSetting *) g_object_new (setting_type, NULL);
 
+	if (nm_streq (nm_setting_get_name (setting), "team")) {
+		gs_free char *ss = NULL;
+
+		g_print (">>> parse %p from D-Bus: %s\n", setting,
+		         (ss = g_variant_print (setting_dict, TRUE)));
+	}
+
 	if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
 		GVariantIter iter;
 		GVariant *entry, *entry_key;