diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:52 +0200 |
| commit | d8cad4490d54acb162ad218a8a682ab379bb8bcc (patch) | |
| tree | 140abd545d62a1b0144be27c93ad8edb021e4311 /libnm-core/nm-setting-ppp.c | |
| parent | e3bc109cd0eb97346c448f591af518d85dbee21b (diff) | |
| parent | 8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (diff) | |
Update upstream source from tag 'upstream/1.13.90'
Update to upstream version '1.13.90' with Debian dir d7d3d98e1240df49343a72511602da7099232e10
Diffstat (limited to 'libnm-core/nm-setting-ppp.c')
| -rw-r--r-- | libnm-core/nm-setting-ppp.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c index 32900c84..7425da19 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/libnm-core/nm-setting-ppp.c @@ -35,9 +35,7 @@ * cable and DSL modems and some mobile broadband devices. **/ -G_DEFINE_TYPE_WITH_CODE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING, - _nm_register_setting (PPP, NM_SETTING_PRIORITY_AUX)) -NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPP) +G_DEFINE_TYPE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING) #define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate)) @@ -525,19 +523,18 @@ get_property (GObject *object, guint prop_id, } static void -nm_setting_ppp_class_init (NMSettingPppClass *setting_class) +nm_setting_ppp_class_init (NMSettingPppClass *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 (NMSettingPppPrivate)); + g_type_class_add_private (klass, sizeof (NMSettingPppPrivate)); - /* virtual methods */ object_class->set_property = set_property; object_class->get_property = get_property; - parent_class->verify = verify; - /* Properties */ + setting_class->verify = verify; + /** * NMSettingPpp:noauth: * @@ -798,4 +795,6 @@ nm_setting_ppp_class_init (NMSettingPppClass *setting_class) G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); + + _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPP); } |