diff options
Diffstat (limited to 'libnm-core/nm-setting-pppoe.c')
| -rw-r--r-- | libnm-core/nm-setting-pppoe.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c index d7a1a0db..793d93ce 100644 --- a/libnm-core/nm-setting-pppoe.c +++ b/libnm-core/nm-setting-pppoe.c @@ -38,9 +38,7 @@ * to provide IP transport, for example cable or DSL modems. **/ -G_DEFINE_TYPE_WITH_CODE (NMSettingPppoe, nm_setting_pppoe, NM_TYPE_SETTING, - _nm_register_setting (PPPOE, NM_SETTING_PRIORITY_AUX)) -NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPPOE) +G_DEFINE_TYPE (NMSettingPppoe, nm_setting_pppoe, NM_TYPE_SETTING) #define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPppoePrivate)) @@ -288,21 +286,20 @@ finalize (GObject *object) } static void -nm_setting_pppoe_class_init (NMSettingPppoeClass *setting_class) +nm_setting_pppoe_class_init (NMSettingPppoeClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (setting_class); - NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + NMSettingClass *setting_class = NM_SETTING_CLASS (klass); - g_type_class_add_private (setting_class, sizeof (NMSettingPppoePrivate)); + g_type_class_add_private (klass, sizeof (NMSettingPppoePrivate)); - /* virtual methods */ object_class->set_property = set_property; object_class->get_property = get_property; object_class->finalize = finalize; - parent_class->verify = verify; - parent_class->need_secrets = need_secrets; - /* Properties */ + setting_class->verify = verify; + setting_class->need_secrets = need_secrets; + /** * NMSettingPppoe:parent: * @@ -374,4 +371,6 @@ nm_setting_pppoe_class_init (NMSettingPppoeClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPPOE); } |