From 875c1af2fd41b9e575ef46bf997ffac9d4f8120e Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 1 Feb 2013 08:46:16 -0600
Subject: [PATCH] core: use Config object for connectivity checking parameters

---
 src/main.c            |  3 ---
 src/nm-connectivity.c | 16 ++++++++++------
 src/nm-connectivity.h |  4 +---
 src/nm-manager.c      |  5 +----
 src/nm-manager.h      |  3 ---
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/main.c b/src/main.c
index 461308c086..21b07951a9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -538,9 +538,6 @@ main (int argc, char *argv[])
 	                          wifi_enabled,
 	                          wwan_enabled,
 	                          wimax_enabled,
-	                          nm_config_get_connectivity_uri (config),
-	                          nm_config_get_connectivity_interval (config),
-	                          nm_config_get_connectivity_response (config),
 	                          &error);
 	if (manager == NULL) {
 		nm_log_err (LOGD_CORE, "failed to initialize the network manager: %s",
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 7e0de2c190..a225e77b04 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -26,7 +26,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)
 
@@ -190,19 +190,23 @@ nm_connectivity_stop_check (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);
 	update_connected (self, FALSE);
+	g_object_unref (config);
 
 	return self;
 }
diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 6f6ee16515..3122bbcabb 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -53,9 +53,7 @@ typedef struct {
 GType nm_connectivity_get_type (void);
 
 
-NMConnectivity *nm_connectivity_new           (const gchar *check_uri,
-                                               guint check_interval,
-                                               const gchar *check_response);
+NMConnectivity *nm_connectivity_new           (void);
 
 void            nm_connectivity_start_check   (NMConnectivity *connectivity);
 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 364f4d5288..894706f463 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4081,9 +4081,6 @@ nm_manager_new (NMSettings *settings,
                 gboolean initial_wifi_enabled,
                 gboolean initial_wwan_enabled,
                 gboolean initial_wimax_enabled,
-                const gchar *connectivity_uri,
-                gint connectivity_interval,
-                const gchar *connectivity_response,
                 GError **error)
 {
 	NMManagerPrivate *priv;
@@ -4100,7 +4097,7 @@ nm_manager_new (NMSettings *settings,
 	priv = NM_MANAGER_GET_PRIVATE (singleton);
 
 #if WITH_CONCHECK
-	priv->connectivity = nm_connectivity_new (connectivity_uri, connectivity_interval, connectivity_response);
+	priv->connectivity = nm_connectivity_new ();
 
 	g_signal_connect (priv->connectivity, "notify::" NM_CONNECTIVITY_CONNECTED,
 	                  G_CALLBACK (connectivity_changed), singleton);
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 710840385a..26bb3db536 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -92,9 +92,6 @@ NMManager *nm_manager_new (NMSettings *settings,
                            gboolean initial_wifi_enabled,
                            gboolean initial_wwan_enabled,
                            gboolean initial_wimax_enabled,
-                           const gchar *connectivity_uri,
-                           gint connectivity_interval,
-                           const gchar *connectivity_response,
                            GError **error);
 
 NMManager *nm_manager_get (void);