New upstream version 1.29.90 upstream/1.29.90

1 files changed, 9 insertions, 35 deletions

diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 0f621289..45644ac3 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -1,10 +1,10 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  * Copyright (C) 2007 - 2011 Red Hat, Inc.
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm-core/nm-default-libnm-core.h"
 
 #include "nm-setting.h"
 
@@ -57,26 +57,6 @@ static GenData *_gendata_hash(NMSetting *setting, gboolean create_if_necessary);
 
 /*****************************************************************************/
 
-static NMSettingPriority
-_get_base_type_priority(const NMMetaSettingInfo *setting_info, GType gtype)
-{
-    /* Historical oddity: PPPoE is a base-type even though it's not
-     * priority 1.  It needs to be sorted *after* lower-level stuff like
-     * Wi-Fi security or 802.1x for secrets, but it's still allowed as a
-     * base type.
-     */
-
-    if (setting_info) {
-        if (NM_IN_SET(setting_info->setting_priority,
-                      NM_SETTING_PRIORITY_HW_BASE,
-                      NM_SETTING_PRIORITY_HW_NON_BASE)
-            || gtype == NM_TYPE_SETTING_PPPOE)
-            return setting_info->setting_priority;
-    }
-
-    return NM_SETTING_PRIORITY_INVALID;
-}
-
 NMSettingPriority
 _nm_setting_get_setting_priority(NMSetting *setting)
 {
@@ -89,18 +69,12 @@ _nm_setting_get_setting_priority(NMSetting *setting)
 }
 
 NMSettingPriority
-_nm_setting_type_get_base_type_priority(GType type)
-{
-    return _get_base_type_priority(nm_meta_setting_infos_by_gtype(type), type);
-}
-
-NMSettingPriority
 _nm_setting_get_base_type_priority(NMSetting *setting)
 {
     g_return_val_if_fail(NM_IS_SETTING(setting), NM_SETTING_PRIORITY_INVALID);
 
-    return _get_base_type_priority(NM_SETTING_GET_CLASS(setting)->setting_info,
-                                   G_OBJECT_TYPE(setting));
+    return nm_meta_setting_info_get_base_type_priority(NM_SETTING_GET_CLASS(setting)->setting_info,
+                                                       G_OBJECT_TYPE(setting));
 }
 
 /**
@@ -797,7 +771,7 @@ _nm_setting_new_from_dbus(GType               setting_type,
      * either be ignored or else has a backward-compatibility equivalent
      * that we do know about.
      */
-    setting = (NMSetting *) g_object_new(setting_type, NULL);
+    setting = g_object_new(setting_type, NULL);
 
     if (NM_FLAGS_HAS(parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
         GVariantIter iter;
@@ -1481,10 +1455,10 @@ _nm_setting_compare(NMConnection *        con_a,
         GenData *a_gendata = _gendata_hash(a, FALSE);
         GenData *b_gendata = _gendata_hash(b, FALSE);
 
-        return nm_utils_hash_table_equal(a_gendata ? a_gendata->hash : NULL,
-                                         b_gendata ? b_gendata->hash : NULL,
-                                         TRUE,
-                                         g_variant_equal);
+        return nm_utils_hashtable_equal(a_gendata ? a_gendata->hash : NULL,
+                                        b_gendata ? b_gendata->hash : NULL,
+                                        TRUE,
+                                        g_variant_equal);
     }
 
     for (i = 0; i < sett_info->property_infos_len; i++) {