Merge tag 'upstream/0.9.4.0'

Upstream version 0.9.4.0

1 files changed, 7 insertions, 3 deletions

diff --git a/src/nm-config.h b/src/nm-config.h
index fae344fb..6c4206c1 100644
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -27,19 +27,20 @@
 typedef struct NMConfig NMConfig;
 
 typedef enum {
-	NM_CONFIG_ERROR_NO_MEMORY = 0,
+	NM_CONFIG_ERROR_NO_MEMORY = 0, /*< nick=NoMemory >*/
 } NMConfigError;
 
 #define NM_CONFIG_ERROR (nm_config_error_quark ())
 GQuark nm_config_error_quark (void);
-#define NM_TYPE_CONFIG_ERROR (nm_config_error_get_type ())
-GType nm_config_error_get_type (void);
 
 
 NMConfig *nm_config_new (const char *cli_config_path,
                          const char *cli_plugins,
                          const char *cli_log_level,
                          const char *cli_log_domains,
+                         const char *cli_connectivity_check_uri,
+                         const gint connectivity_check_interval,
+                         const char *cli_connectivity_check_response,
                          GError **error);
 
 const char *nm_config_get_path (NMConfig *config);
@@ -48,6 +49,9 @@ const char *nm_config_get_dhcp_client (NMConfig *config);
 const char **nm_config_get_dns_plugins (NMConfig *config);
 const char *nm_config_get_log_level (NMConfig *config);
 const char *nm_config_get_log_domains (NMConfig *config);
+const char *nm_config_get_connectivity_uri (NMConfig *config);
+const guint nm_config_get_connectivity_interval (NMConfig *config);
+const char *nm_config_get_connectivity_response (NMConfig *config);
 
 void nm_config_free (NMConfig *config);