diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
| commit | 54de7f04d1fac5f29fd54ec4120ba2fc4f9b5714 (patch) | |
| tree | 87729385ff8de744dc44d0b4cc75916494b2fd38 /libnm-util/nm-setting.c | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'libnm-util/nm-setting.c')
| -rw-r--r-- | libnm-util/nm-setting.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 3bcefbc5..c74d2d71 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -102,7 +102,6 @@ static void _ensure_registered (void) { if (G_UNLIKELY (registered_settings == NULL)) { - nm_g_type_init (); _nm_value_transforms_register (); registered_settings = g_hash_table_new (g_str_hash, g_str_equal); registered_settings_by_type = g_hash_table_new (_nm_gtype_hash, _nm_gtype_equal); @@ -1330,7 +1329,6 @@ nm_setting_get_virtual_iface_name (NMSetting *setting) return NULL; } - NMSettingVerifyResult _nm_setting_verify_deprecated_virtual_iface_name (const char *interface_name, gboolean allow_missing, |