diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-26 23:25:23 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-26 23:25:23 +0100 |
| commit | 9a6dcbf895f9da01768e64b73cec88c16157d91e (patch) | |
| tree | a359958930d731e9f1b59344642e10754419fe84 /libnm-core/nm-setting-match.c | |
| parent | 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 (diff) | |
New upstream version 1.16.0 upstream/1.16.0
Diffstat (limited to 'libnm-core/nm-setting-match.c')
| -rw-r--r-- | libnm-core/nm-setting-match.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c index 0964c644..2f331060 100644 --- a/libnm-core/nm-setting-match.c +++ b/libnm-core/nm-setting-match.c @@ -15,6 +15,7 @@ #include "nm-default.h" #include "nm-setting-match.h" + #include "nm-setting-private.h" #include "nm-utils-private.h" @@ -24,6 +25,12 @@ * @include: nm-setting-match.h **/ +/*****************************************************************************/ + +NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch, + PROP_INTERFACE_NAME, +); + /** * NMSettingMatch: * @@ -42,10 +49,6 @@ struct _NMSettingMatchClass { G_DEFINE_TYPE (NMSettingMatch, nm_setting_match, NM_TYPE_SETTING) -NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch, - PROP_INTERFACE_NAME, -); - /*****************************************************************************/ /** @@ -194,6 +197,8 @@ nm_setting_match_get_interface_names (NMSettingMatch *setting, guint *length) return (const char *const *) setting->interface_name->pdata; } +/*****************************************************************************/ + static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) @@ -227,6 +232,8 @@ set_property (GObject *object, guint prop_id, } } +/*****************************************************************************/ + static void nm_setting_match_init (NMSettingMatch *setting) { @@ -264,9 +271,9 @@ nm_setting_match_class_init (NMSettingMatchClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); NMSettingClass *setting_class = NM_SETTING_CLASS (klass); - object_class->finalize = finalize; object_class->get_property = get_property; object_class->set_property = set_property; + object_class->finalize = finalize; /** * NMSettingMatch:interface-name |