From 7961e1bb8a1c9fbe5ff833444caeff7da0d6ce0b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 16 May 2016 17:27:26 +0200 Subject: [PATCH] core: add nm_connection_provider_get_unmanaged_specs() --- src/nm-connection-provider.c | 9 +++++++++ src/nm-connection-provider.h | 8 +++++--- src/settings/nm-settings.c | 7 +++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/nm-connection-provider.c b/src/nm-connection-provider.c index e04cab928e..fe1ea7e205 100644 --- a/src/nm-connection-provider.c +++ b/src/nm-connection-provider.c @@ -16,6 +16,7 @@ #include "nm-default.h" #include "nm-connection-provider.h" + #include "nm-utils.h" G_DEFINE_INTERFACE (NMConnectionProvider, nm_connection_provider, G_TYPE_OBJECT) @@ -90,6 +91,14 @@ nm_connection_provider_get_connection_by_uuid (NMConnectionProvider *self, return NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_connection_by_uuid (self, uuid); } +const GSList * +nm_connection_provider_get_unmanaged_specs (NMConnectionProvider *self) +{ + g_return_val_if_fail (NM_IS_CONNECTION_PROVIDER (self), NULL); + + return NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_unmanaged_specs (self); +} + /*****************************************************************************/ static void diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h index b31af05fbe..1209213bcb 100644 --- a/src/nm-connection-provider.h +++ b/src/nm-connection-provider.h @@ -16,9 +16,7 @@ #ifndef __NETWORKMANAGER_CONNECTION_PROVIDER_H__ #define __NETWORKMANAGER_CONNECTION_PROVIDER_H__ -#include - -#include "nm-default.h" +#include "nm-connection.h" #define NM_TYPE_CONNECTION_PROVIDER (nm_connection_provider_get_type ()) #define NM_CONNECTION_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProvider)) @@ -63,6 +61,8 @@ typedef struct { NMConnection * (*get_connection_by_uuid) (NMConnectionProvider *self, const char *uuid); + + const GSList * (*get_unmanaged_specs) (NMConnectionProvider *self); } NMConnectionProviderInterface; GType nm_connection_provider_get_type (void); @@ -124,4 +124,6 @@ NMConnection *nm_connection_provider_add_connection (NMConnectionProvider *self, NMConnection *nm_connection_provider_get_connection_by_uuid (NMConnectionProvider *self, const char *uuid); +const GSList *nm_connection_provider_get_unmanaged_specs (NMConnectionProvider *self); + #endif /* __NETWORKMANAGER_CONNECTION_PROVIDER_H__ */ diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 953662bb5b..7c42213585 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2151,6 +2151,12 @@ cp_get_connection_by_uuid (NMConnectionProvider *provider, const char *uuid) return NM_CONNECTION (nm_settings_get_connection_by_uuid (NM_SETTINGS (provider), uuid)); } +static const GSList * +cp_get_unmanaged_specs (NMConnectionProvider *provider) +{ + return nm_settings_get_unmanaged_specs (NM_SETTINGS (provider)); +} + /***************************************************************/ gboolean @@ -2318,6 +2324,7 @@ connection_provider_iface_init (NMConnectionProviderInterface *cp_iface) cp_iface->get_connections = get_connections; cp_iface->add_connection = _nm_connection_provider_add_connection; cp_iface->get_connection_by_uuid = cp_get_connection_by_uuid; + cp_iface->get_unmanaged_specs = cp_get_unmanaged_specs; } static void