diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-12-29 00:39:15 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-17 14:47:31 +0100 |
| commit | 7828a8e923bbbfba7e05806c3520e9de1bd91c67 (patch) | |
| tree | bf69725cd2ec4d7260cb67ebff64460071d70c64 | |
| parent | e0d81bec4c69283d917424db84fab9e3bb1c04fd (diff) | |
| download | NetworkManager-7828a8e923bbbfba7e05806c3520e9de1bd91c67.tar.gz | |
Revert "XXX setting no serialize empty"
This reverts commit f8ada771c09bc6f3bdf103407cd548316e5d2ed0.
| -rw-r--r-- | libnm-core/nm-setting.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 12328a52c3..b9ac5aec97 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -720,7 +720,6 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS GVariant *dbus_value; const NMSettingProperty *properties; guint n_properties, i; - gboolean empty = TRUE; g_return_val_if_fail (NM_IS_SETTING (setting), NULL); @@ -756,26 +755,16 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS dbus_value = property->synth_func (setting, connection, property->name); else dbus_value = get_property_for_dbus (setting, property, TRUE); - if (dbus_value) { /* Allow dbus_value to be either floating or not. */ g_variant_take_ref (dbus_value); g_variant_builder_add (&builder, "{sv}", property->name, dbus_value); g_variant_unref (dbus_value); - - empty = FALSE; } } - dbus_value = g_variant_builder_end (&builder); - - if (empty && (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)) { - g_variant_unref (dbus_value); - dbus_value = NULL; - } - - return dbus_value; + return g_variant_builder_end (&builder); } /** |