diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-04-23 09:43:20 -0500 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-27 15:08:17 +0200 |
| commit | 9b4b3b6ef68942d66fccf9840997c4a32424af3b (patch) | |
| tree | d4bdfb2588b58b03d01a00a34968cfbbe9a665fa | |
| parent | c8d32f1aa6b2fee2a978a1c70303af2bf05d3e06 (diff) | |
| download | NetworkManager-lr/nm-1-0.tar.gz | |
settings: remove 'do_export' argument from claim_connection()lr/nm-1-0
It was always TRUE, and unused anyway.
(cherry picked from commit bbcf5444fd83bbff6124ad90ab4f1ce29ce13e1c)
| -rw-r--r-- | src/settings/nm-settings.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index d5252eca89..fe3f9eeece 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); @@ -896,9 +895,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; @@ -1049,7 +1046,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", |