New upstream version 1.12.4 upstream/1.12.4

1 files changed, 18 insertions, 23 deletions

diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c
index b31da689..3011d917 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -38,7 +38,9 @@
  * networks, including those using GPRS/EDGE and UMTS/HSPA technology.
  */
 
-G_DEFINE_TYPE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING)
+G_DEFINE_TYPE_WITH_CODE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING,
+                         _nm_register_setting (GSM, NM_SETTING_PRIORITY_HW_BASE))
+NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_GSM)
 
 #define NM_SETTING_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GSM, NMSettingGsmPrivate))
 
@@ -602,21 +604,22 @@ get_property (GObject *object, guint prop_id,
 }
 
 static void
-nm_setting_gsm_class_init (NMSettingGsmClass *klass)
+nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
-	GArray *properties_override = _nm_sett_info_property_override_create_array ();
+	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
+	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
 
-	g_type_class_add_private (klass, sizeof (NMSettingGsmPrivate));
+	g_type_class_add_private (setting_class, sizeof (NMSettingGsmPrivate));
 
+	/* virtual methods */
 	object_class->set_property = set_property;
 	object_class->get_property = get_property;
 	object_class->finalize     = finalize;
+	parent_class->verify       = verify;
+	parent_class->verify_secrets = verify_secrets;
+	parent_class->need_secrets = need_secrets;
 
-	setting_class->verify         = verify;
-	setting_class->verify_secrets = verify_secrets;
-	setting_class->need_secrets   = need_secrets;
+	/* Properties */
 
 	/**
 	 * NMSettingGsm:number:
@@ -819,18 +822,10 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 		                    G_PARAM_STATIC_STRINGS));
 
 	/* Ignore incoming deprecated properties */
-	_properties_override_add_dbus_only (properties_override,
-	                                    "allowed-bands",
-	                                    G_VARIANT_TYPE_UINT32,
-	                                    NULL,
-	                                    NULL);
-
-	_properties_override_add_dbus_only (properties_override,
-	                                    "network-type",
-	                                    G_VARIANT_TYPE_INT32,
-	                                    NULL,
-	                                    NULL);
-
-	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_GSM,
-	                               NULL, properties_override);
+	_nm_setting_class_add_dbus_only_property (parent_class, "allowed-bands",
+	                                          G_VARIANT_TYPE_UINT32,
+	                                          NULL, NULL);
+	_nm_setting_class_add_dbus_only_property (parent_class, "network-type",
+	                                          G_VARIANT_TYPE_INT32,
+	                                          NULL, NULL);
 }