summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2015-04-23 09:43:20 -0500
committerLubomir Rintel <lkundrak@v3.sk>2015-04-27 11:33:59 +0200
commitbbcf5444fd83bbff6124ad90ab4f1ce29ce13e1c (patch)
tree413dd2779ccfb475aa36a548cbb737a14827a492
parentfe96dbc0ee15b7df7bf6920bed2a054304059ae2 (diff)
downloadNetworkManager-lr/james-bond-rh1183424.tar.gz
settings: remove 'do_export' argument from claim_connection()lr/james-bond-rh1183424
It was always TRUE, and unused anyway.
-rw-r--r--src/settings/nm-settings.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 9ba0e218c0..6100681502 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -95,8 +95,7 @@ EXPORT(nm_settings_connection_replace_and_commit)
/* END LINKER CRACKROCK */
static void claim_connection (NMSettings *self,
- NMSettingsConnection *connection,
- gboolean do_export);
+ NMSettingsConnection *connection);
static gboolean impl_settings_list_connections (NMSettings *self,
GPtrArray **connections,
@@ -218,7 +217,7 @@ plugin_connection_added (NMSystemConfigInterface *config,
NMSettingsConnection *connection,
gpointer user_data)
{
- claim_connection (NM_SETTINGS (user_data), connection, TRUE);
+ claim_connection (NM_SETTINGS (user_data), connection);
}
static void
@@ -239,7 +238,7 @@ load_connections (NMSettings *self)
// priority plugin.
for (elt = plugin_connections; elt; elt = g_slist_next (elt))
- claim_connection (self, NM_SETTINGS_CONNECTION (elt->data), TRUE);
+ claim_connection (self, NM_SETTINGS_CONNECTION (elt->data));
g_slist_free (plugin_connections);
@@ -895,9 +894,7 @@ openconnect_migrate_hack (NMConnection *connection)
}
static void
-claim_connection (NMSettings *self,
- NMSettingsConnection *connection,
- gboolean do_export)
+claim_connection (NMSettings *self, NMSettingsConnection *connection)
{
NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
static guint32 ec_counter = 0;
@@ -1048,7 +1045,7 @@ nm_settings_add_connection (NMSettings *self,
added = nm_system_config_interface_add_connection (plugin, connection, save_to_disk, &add_error);
if (added) {
- claim_connection (self, added, TRUE);
+ claim_connection (self, added);
return added;
}
nm_log_dbg (LOGD_SETTINGS, "Failed to add %s/'%s': %s",