From 19ef103e39236c5a980955930a8e52be0ff69c95 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 29 Jul 2018 13:25:49 +0200 Subject: [PATCH] libnm-core/trivial: move code --- libnm-core/nm-setting.c | 74 +++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 3d0726c7e6..887e8aeb4f 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -549,42 +549,6 @@ _nm_setting_class_transform_property (NMSettingClass *setting_class, to_dbus, from_dbus); } -gboolean -_nm_setting_use_legacy_property (NMSetting *setting, - GVariant *connection_dict, - const char *legacy_property, - const char *new_property) -{ - GVariant *setting_dict, *value; - - setting_dict = g_variant_lookup_value (connection_dict, nm_setting_get_name (NM_SETTING (setting)), NM_VARIANT_TYPE_SETTING); - g_return_val_if_fail (setting_dict != NULL, FALSE); - - /* If the new property isn't set, we have to use the legacy property. */ - value = g_variant_lookup_value (setting_dict, new_property, NULL); - if (!value) { - g_variant_unref (setting_dict); - return TRUE; - } - g_variant_unref (value); - - /* Otherwise, clients always prefer new properties sent from the daemon. */ - if (!_nm_utils_is_manager_process) { - g_variant_unref (setting_dict); - return FALSE; - } - - /* The daemon prefers the legacy property if it exists. */ - value = g_variant_lookup_value (setting_dict, legacy_property, NULL); - g_variant_unref (setting_dict); - - if (value) { - g_variant_unref (value); - return TRUE; - } else - return FALSE; -} - static GArray * nm_setting_class_ensure_properties (NMSettingClass *setting_class) { @@ -658,6 +622,44 @@ nm_setting_class_find_property (NMSettingClass *setting_class, const char *prope /*****************************************************************************/ +gboolean +_nm_setting_use_legacy_property (NMSetting *setting, + GVariant *connection_dict, + const char *legacy_property, + const char *new_property) +{ + GVariant *setting_dict, *value; + + setting_dict = g_variant_lookup_value (connection_dict, nm_setting_get_name (NM_SETTING (setting)), NM_VARIANT_TYPE_SETTING); + g_return_val_if_fail (setting_dict != NULL, FALSE); + + /* If the new property isn't set, we have to use the legacy property. */ + value = g_variant_lookup_value (setting_dict, new_property, NULL); + if (!value) { + g_variant_unref (setting_dict); + return TRUE; + } + g_variant_unref (value); + + /* Otherwise, clients always prefer new properties sent from the daemon. */ + if (!_nm_utils_is_manager_process) { + g_variant_unref (setting_dict); + return FALSE; + } + + /* The daemon prefers the legacy property if it exists. */ + value = g_variant_lookup_value (setting_dict, legacy_property, NULL); + g_variant_unref (setting_dict); + + if (value) { + g_variant_unref (value); + return TRUE; + } else + return FALSE; +} + +/*****************************************************************************/ + static const GVariantType * variant_type_for_gtype (GType type) {