From 33491bc4279481db8ae47213e34a6d695a0e8830 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Jul 2014 02:16:10 +0200 Subject: Imported Upstream version 0.9.10.0 --- src/nm-connectivity.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/nm-connectivity.c') diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index 7e3bed99..5c6a43f6 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -28,7 +28,7 @@ #include "nm-connectivity.h" #include "nm-logging.h" -#include "nm-manager.h" +#include "nm-config.h" G_DEFINE_TYPE (NMConnectivity, nm_connectivity, G_TYPE_OBJECT) @@ -238,15 +238,18 @@ nm_connectivity_check_finish (NMConnectivity *self, NMConnectivity * -nm_connectivity_new (const gchar *check_uri, - guint check_interval, - const gchar *check_response) +nm_connectivity_new (void) { NMConnectivity *self; + NMConfig *config; + const char *check_response; + + config = nm_config_get (); + check_response = nm_config_get_connectivity_response (config); self = g_object_new (NM_TYPE_CONNECTIVITY, - NM_CONNECTIVITY_URI, check_uri, - NM_CONNECTIVITY_INTERVAL, check_interval, + NM_CONNECTIVITY_URI, nm_config_get_connectivity_uri (config), + NM_CONNECTIVITY_INTERVAL, nm_config_get_connectivity_interval (config), NM_CONNECTIVITY_RESPONSE, check_response ? check_response : DEFAULT_RESPONSE, NULL); g_return_val_if_fail (self != NULL, NULL); -- cgit 1.3.0-6-gf8a5