Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 2 insertions, 8 deletions

diff --git a/src/nm-config-data.h b/src/nm-config-data.h
index e63b4590..b5e3c674 100644
--- a/src/nm-config-data.h
+++ b/src/nm-config-data.h
@@ -28,7 +28,6 @@
 #define NM_IS_CONFIG_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_CONFIG_DATA))
 #define NM_CONFIG_DATA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_CONFIG_DATA, NMConfigDataClass))
 
-
 #define NM_CONFIG_DATA_CONFIG_MAIN_FILE      "config-main-file"
 #define NM_CONFIG_DATA_CONFIG_DESCRIPTION    "config-description"
 #define NM_CONFIG_DATA_KEYFILE_USER          "keyfile-user"
@@ -128,13 +127,7 @@ typedef enum { /*< flags >*/
 
 } NMConfigChangeFlags;
 
-struct _NMConfigData {
-	GObject parent;
-};
-
-typedef struct {
-	GObjectClass parent;
-} NMConfigDataClass;
+typedef struct _NMConfigDataClass NMConfigDataClass;
 
 typedef struct _NMGlobalDnsConfig NMGlobalDnsConfig;
 typedef struct _NMGlobalDnsDomain NMGlobalDnsDomain;
@@ -165,6 +158,7 @@ char *nm_config_data_get_value (const NMConfigData *config_data, const char *gro
 const char *nm_config_data_get_value_cached (const NMConfigData *config_data, const char *group, const char *key, NMConfigGetValueFlags flags);
 gint nm_config_data_get_value_boolean (const NMConfigData *self, const char *group, const char *key, gint default_value);
 
+char **nm_config_data_get_plugins (const NMConfigData *config_data, gboolean allow_default);
 const char *nm_config_data_get_connectivity_uri (const NMConfigData *config_data);
 const guint nm_config_data_get_connectivity_interval (const NMConfigData *config_data);
 const char *nm_config_data_get_connectivity_response (const NMConfigData *config_data);