diff options
| author | Michael Biebl <biebl@debian.org> | 2019-07-31 10:52:41 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-07-31 10:52:41 +0200 |
| commit | 3a99ba5fd066fe42bd5461360a7411766496619c (patch) | |
| tree | b43863fbe867d7b0f9f9032fd40664c521c88fcb /libnm-core/nm-setting.h | |
| parent | 13cfe714153013158bdf3e74ab58ab713a04223c (diff) | |
| parent | 2e5fa45ddfbb5cffa1e78221f1cea706e2f298af (diff) | |
Update upstream source from tag 'upstream/1.19.90'
Update to upstream version '1.19.90' with Debian dir 6d1a5b9902866beee1365904d425141b5d4c944c
Diffstat (limited to 'libnm-core/nm-setting.h')
| -rw-r--r-- | libnm-core/nm-setting.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index fdf4a4c5..34586cce 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -1,5 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -236,8 +234,10 @@ typedef struct { /*< private >*/ NMTernary (*compare_property) (const struct _NMSettInfoSetting *sett_info, guint property_idx, - NMSetting *setting, - NMSetting *other, + NMConnection *con_a, + NMSetting *set_a, + NMConnection *con_b, + NMSetting *set_b, NMSettingCompareFlags flags); /*< private >*/ @@ -266,7 +266,15 @@ typedef struct { GVariantBuilder *setting_builder); /*< private >*/ - gpointer padding[2]; + gboolean (*init_from_dbus) (NMSetting *setting, + GHashTable *keys, + GVariant *setting_dict, + GVariant *connection_dict, + guint /* NMSettingParseFlags */ parse_flags, + GError **error); + + /*< private >*/ + gpointer padding[1]; /*< private >*/ const struct _NMMetaSettingInfo *setting_info; |