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-generic.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-generic.c')
| -rw-r--r-- | libnm-core/nm-setting-generic.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-generic.c b/libnm-core/nm-setting-generic.c index 96f26ac2..44402e39 100644 --- a/libnm-core/nm-setting-generic.c +++ b/libnm-core/nm-setting-generic.c @@ -36,9 +36,7 @@ * the "connection type" setting on #NMConnections for generic devices. **/ -G_DEFINE_TYPE_WITH_CODE (NMSettingGeneric, nm_setting_generic, NM_TYPE_SETTING, - _nm_register_setting (GENERIC, NM_SETTING_PRIORITY_HW_BASE)) -NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_GENERIC) +G_DEFINE_TYPE (NMSettingGeneric, nm_setting_generic, NM_TYPE_SETTING) #define NM_SETTING_GENERIC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GENERIC, NMSettingGenericPrivate)) @@ -67,7 +65,11 @@ nm_setting_generic_init (NMSettingGeneric *setting) } static void -nm_setting_generic_class_init (NMSettingGenericClass *setting_class) +nm_setting_generic_class_init (NMSettingGenericClass *klass) { - g_type_class_add_private (setting_class, sizeof (NMSettingGenericPrivate)); + NMSettingClass *setting_class = NM_SETTING_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NMSettingGenericPrivate)); + + _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_GENERIC); } |