diff options
Diffstat (limited to 'libnm-core/nm-setting-ip4-config.c')
| -rw-r--r-- | libnm-core/nm-setting-ip4-config.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index dd3b79b7..73ba4b74 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -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 @@ -253,19 +251,19 @@ ip4_dns_from_dbus (GVariant *dbus_value, } static GVariant * -ip4_addresses_get (NMSetting *setting, - const char *property) +ip4_addresses_get (const NMSettInfoSetting *sett_info, + guint property_idx, + NMConnection *connection, + NMSetting *setting, + NMConnectionSerializationFlags flags, + const NMConnectionSerializationOptions *options) { - GPtrArray *addrs; + gs_unref_ptrarray GPtrArray *addrs = NULL; const char *gateway; - GVariant *ret; - g_object_get (setting, property, &addrs, NULL); + g_object_get (setting, NM_SETTING_IP_CONFIG_ADDRESSES, &addrs, NULL); gateway = nm_setting_ip_config_get_gateway (NM_SETTING_IP_CONFIG (setting)); - ret = nm_utils_ip4_addresses_to_variant (addrs, gateway); - g_ptr_array_unref (addrs); - - return ret; + return nm_utils_ip4_addresses_to_variant (addrs, gateway); } static gboolean @@ -311,7 +309,8 @@ ip4_address_labels_get (const NMSettInfoSetting *sett_info, guint property_idx, NMConnection *connection, NMSetting *setting, - NMConnectionSerializationFlags flags) + NMConnectionSerializationFlags flags, + const NMConnectionSerializationOptions *options) { NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting); gboolean have_labels = FALSE; @@ -354,7 +353,8 @@ ip4_address_data_get (const NMSettInfoSetting *sett_info, guint property_idx, NMConnection *connection, NMSetting *setting, - NMConnectionSerializationFlags flags) + NMConnectionSerializationFlags flags, + const NMConnectionSerializationOptions *options) { gs_unref_ptrarray GPtrArray *addrs = NULL; @@ -388,17 +388,17 @@ ip4_address_data_set (NMSetting *setting, } static GVariant * -ip4_routes_get (NMSetting *setting, - const char *property) +ip4_routes_get (const NMSettInfoSetting *sett_info, + guint property_idx, + NMConnection *connection, + NMSetting *setting, + NMConnectionSerializationFlags flags, + const NMConnectionSerializationOptions *options) { - GPtrArray *routes; - GVariant *ret; - - g_object_get (setting, property, &routes, NULL); - ret = nm_utils_ip4_routes_to_variant (routes); - g_ptr_array_unref (routes); + gs_unref_ptrarray GPtrArray *routes = NULL; - return ret; + g_object_get (setting, NM_SETTING_IP_CONFIG_ROUTES, &routes, NULL); + return nm_utils_ip4_routes_to_variant (routes); } static gboolean @@ -427,7 +427,8 @@ ip4_route_data_get (const NMSettInfoSetting *sett_info, guint property_idx, NMConnection *connection, NMSetting *setting, - NMConnectionSerializationFlags flags) + NMConnectionSerializationFlags flags, + const NMConnectionSerializationOptions *options) { gs_unref_ptrarray GPtrArray *routes = NULL; |