colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: remove 'do_export' argument from claim_connection()

Browse Source 
It was always TRUE, and unused anyway.
This commit is contained in:
Dan Williams
2015-04-23 09:43:20 -05:00
committed by Lubomir Rintel
parent fe96dbc0ee
commit bbcf5444fd
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/settings/nm-settings.c
View File

@@ -95,8 +95,7 @@ EXPORT(nm_settings_connection_replace_and_commit)
/* END LINKER CRACKROCK */ /* END LINKER CRACKROCK */
static void claim_connection (NMSettings *self, static void claim_connection (NMSettings *self,
NMSettingsConnection *connection, NMSettingsConnection *connection);
gboolean do_export);
static gboolean impl_settings_list_connections (NMSettings *self, static gboolean impl_settings_list_connections (NMSettings *self,
GPtrArray **connections, GPtrArray **connections,
@@ -218,7 +217,7 @@ plugin_connection_added (NMSystemConfigInterface *config,
NMSettingsConnection *connection, NMSettingsConnection *connection,
gpointer user_data) gpointer user_data)
{ {
claim_connection (NM_SETTINGS (user_data), connection, TRUE); claim_connection (NM_SETTINGS (user_data), connection);
} }
static void static void
@@ -239,7 +238,7 @@ load_connections (NMSettings *self)
// priority plugin. // priority plugin.
for (elt = plugin_connections; elt; elt = g_slist_next (elt)) 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); g_slist_free (plugin_connections);
@@ -895,9 +894,7 @@ openconnect_migrate_hack (NMConnection *connection)
} }
static void static void
claim_connection (NMSettings *self, claim_connection (NMSettings *self, NMSettingsConnection *connection)
NMSettingsConnection *connection,
gboolean do_export)
{ {
NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self); NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
static guint32 ec_counter = 0; 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); added = nm_system_config_interface_add_connection (plugin, connection, save_to_disk, &add_error);
if (added) { if (added) {
claim_connection (self, added, TRUE); claim_connection (self, added);
return added; return added;
} }
nm_log_dbg (LOGD_SETTINGS, "Failed to add %s/'%s': %s", nm_log_dbg (LOGD_SETTINGS, "Failed to add %s/'%s': %s",