From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 25 Jan 2019 11:24:41 +0100 Subject: New upstream version 1.15.2 --- libnm-core/nm-setting-match.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'libnm-core/nm-setting-match.c') 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 -- cgit 1.3.0-6-gf8a5