diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /libnm-core/nm-setting.c | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'libnm-core/nm-setting.c')
| -rw-r--r-- | libnm-core/nm-setting.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index fcd8dff7..82467c9c 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -74,7 +74,7 @@ enum { PROP_LAST }; -/*************************************************************/ +/*****************************************************************************/ static GHashTable *registered_settings = NULL; static GHashTable *registered_settings_by_type = NULL; @@ -115,7 +115,7 @@ _ensure_registered_constructor (void) } \ } G_STMT_END -/*************************************************************/ +/*****************************************************************************/ /* * _nm_register_setting: @@ -264,7 +264,7 @@ _nm_setting_compare_priority (gconstpointer a, gconstpointer b) return 1; } -/*************************************************************/ +/*****************************************************************************/ gboolean _nm_setting_slave_type_is_valid (const char *slave_type, const char **out_port_type) @@ -288,7 +288,7 @@ _nm_setting_slave_type_is_valid (const char *slave_type, const char **out_port_t return found; } -/*************************************************************/ +/*****************************************************************************/ typedef struct { const char *name; @@ -592,7 +592,7 @@ nm_setting_class_find_property (NMSettingClass *setting_class, const char *prope return find_property (properties, property_name); } -/*************************************************************/ +/*****************************************************************************/ static const GVariantType * variant_type_for_gtype (GType type) |