diff options
Diffstat (limited to 'libnm-core/nm-setting-wimax.c')
| -rw-r--r-- | libnm-core/nm-setting-wimax.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c index 4c1a572e..dbfb46e4 100644 --- a/libnm-core/nm-setting-wimax.c +++ b/libnm-core/nm-setting-wimax.c @@ -42,7 +42,9 @@ * connections cannot be activated. **/ -G_DEFINE_TYPE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING) +G_DEFINE_TYPE_WITH_CODE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING, + _nm_register_setting (WIMAX, NM_SETTING_PRIORITY_HW_BASE)) +NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WIMAX) #define NM_SETTING_WIMAX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIMAX, NMSettingWimaxPrivate)) @@ -205,20 +207,20 @@ get_property (GObject *object, guint prop_id, } static void -nm_setting_wimax_class_init (NMSettingWimaxClass *klass) +nm_setting_wimax_class_init (NMSettingWimaxClass *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 (NMSettingWimaxPrivate)); + g_type_class_add_private (setting_class, sizeof (NMSettingWimaxPrivate)); + /* virtual methods */ object_class->set_property = set_property; object_class->get_property = get_property; object_class->finalize = finalize; + parent_class->verify = verify; - setting_class->verify = verify; - + /* Properties */ /** * NMSettingWimax:network-name: * @@ -249,14 +251,8 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - _properties_override_add_transform (properties_override, - g_object_class_find_property (G_OBJECT_CLASS (setting_class), - NM_SETTING_WIMAX_MAC_ADDRESS), - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_hwaddr_to_dbus, - _nm_utils_hwaddr_from_dbus); - - _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIMAX, - NULL, properties_override); + _nm_setting_class_transform_property (parent_class, NM_SETTING_WIMAX_MAC_ADDRESS, + G_VARIANT_TYPE_BYTESTRING, + _nm_utils_hwaddr_to_dbus, + _nm_utils_hwaddr_from_dbus); } |