[PATCH 1/3] core: remove unused arguments from nm_manager_get()

[Dan Williams <dcbw redhat com>]

They weren't used.

---
 src/main.c                |    2 --
 src/nm-device-olpc-mesh.c |    6 +++---
 src/nm-manager.c          |    5 -----
 src/nm-manager.h          |    2 --
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main.c b/src/main.c
index 328c253..a9ffd38 100644
--- a/src/main.c
+++ b/src/main.c
@@ -718,8 +718,6 @@ main (int argc, char *argv[])
 	}
 
 	manager = nm_manager_get (settings,
-	                          config,
-	                          plugins,
 	                          state_file,
 	                          net_enabled,
 	                          wifi_enabled,
diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c
index ae14279..2f130b1 100644
--- a/src/nm-device-olpc-mesh.c
+++ b/src/nm-device-olpc-mesh.c
@@ -653,7 +653,7 @@ dispose (GObject *object)
 
 	device_cleanup (self);
 
-	manager = nm_manager_get (NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
+	manager = nm_manager_get (NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
 	if (priv->device_added_id)
 		g_signal_handler_disconnect (manager, priv->device_added_id);
 	g_object_unref (manager);
@@ -852,7 +852,7 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other)
 	priv->companion = other;
 
 	/* When we've found the companion, stop listening for other devices */
-	manager = nm_manager_get (NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
+	manager = nm_manager_get (NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
 	if (priv->device_added_id) {
 		g_signal_handler_disconnect (manager, priv->device_added_id);
 		priv->device_added_id = 0;
@@ -907,7 +907,7 @@ check_companion_cb (gpointer user_data)
 	if (priv->device_added_id != 0)
 		return FALSE;
 
-	manager = nm_manager_get (NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
+	manager = nm_manager_get (NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL);
 
 	priv->device_added_id = g_signal_connect (manager, "device-added",
 	                                          G_CALLBACK (device_added_cb), self);
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 9200f34..c74bccb 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -196,7 +196,6 @@ typedef struct {
 } RadioState;
 
 typedef struct {
-	char *config_file;
 	char *state_file;
 
 	GSList *devices;
@@ -3044,8 +3043,6 @@ out:
 
 NMManager *
 nm_manager_get (NMSettings *settings,
-                const char *config_file,
-                const char *plugins,
                 const char *state_file,
                 gboolean initial_net_enabled,
                 gboolean initial_wifi_enabled,
@@ -3081,7 +3078,6 @@ nm_manager_get (NMSettings *settings,
 
 	priv->settings = g_object_ref (settings);
 
-	priv->config_file = g_strdup (config_file);
 	priv->state_file = g_strdup (state_file);
 
 	priv->net_enabled = initial_net_enabled;
@@ -3168,7 +3164,6 @@ dispose (GObject *object)
 	}
 
 	g_free (priv->hostname);
-	g_free (priv->config_file);
 
 	g_object_unref (priv->settings);
 
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 22bfca9..afadba2 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -68,8 +68,6 @@ typedef struct {
 GType nm_manager_get_type (void);
 
 NMManager *nm_manager_get (NMSettings *settings,
-                           const char *config_file,
-                           const char *plugins,
                            const char *state_file,
                            gboolean initial_net_enabled,
                            gboolean initial_wifi_enabled,
-- 
1.7.6.2