diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-08-27 13:11:22 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-01-29 10:11:14 -0600 |
| commit | 06c0fbc437411b92fbf9a6b9f566580207d0df9f (patch) | |
| tree | 71ed2153cc9545788afbecf2afd02764355aa20f | |
| parent | b547b946f7c2202de1408f90cf0307678ec4c2a1 (diff) | |
| download | NetworkManager-06c0fbc437411b92fbf9a6b9f566580207d0df9f.tar.gz | |
settings: make nm_settings_connection_recheck_visibility() private
It's mostly used inside nm-settings-connection.c, and the only external
user (nm-settings.c::claim_connection()) is redundant. claim_connection()
is called when a new connection is first seen by NMSettings, but by this
point something has already called nm_settings_connection_replace_settings()
to set all the properties, and that call already does the visibility
check.
| -rw-r--r-- | src/settings/nm-settings-connection.c | 8 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.h | 2 | ||||
| -rw-r--r-- | src/settings/nm-settings.c | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 3ebdf74e53..cb04529dcd 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -243,8 +243,8 @@ nm_settings_connection_is_visible (NMSettingsConnection *self) return NM_SETTINGS_CONNECTION_GET_PRIVATE (self)->visible; } -void -nm_settings_connection_recheck_visibility (NMSettingsConnection *self) +static void +_connection_recheck_visibility (NMSettingsConnection *self) { NMSettingsConnectionPrivate *priv; NMSettingConnection *s_con; @@ -286,7 +286,7 @@ nm_settings_connection_recheck_visibility (NMSettingsConnection *self) static void session_changed_cb (NMSessionMonitor *self, gpointer user_data) { - nm_settings_connection_recheck_visibility (NM_SETTINGS_CONNECTION (user_data)); + _connection_recheck_visibility (NM_SETTINGS_CONNECTION (user_data)); } /**************************************************************/ @@ -461,7 +461,7 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self, } } - nm_settings_connection_recheck_visibility (self); + _connection_recheck_visibility (self); /* Manually emit changed signal since we disconnected the handler, but * only update Unsaved if the caller wanted us to. diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index b680fc4d0d..37759589e5 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -156,8 +156,6 @@ void nm_settings_connection_cancel_secrets (NMSettingsConnection *connection, gboolean nm_settings_connection_is_visible (NMSettingsConnection *self); -void nm_settings_connection_recheck_visibility (NMSettingsConnection *self); - void nm_settings_connection_signal_remove (NMSettingsConnection *self); gboolean nm_settings_connection_get_unsaved (NMSettingsConnection *self); diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 36611938ef..0497cc86ca 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -928,9 +928,6 @@ claim_connection (NMSettings *self, /* Read seen-bssids from look-aside file and put it into the connection's data */ nm_settings_connection_read_and_fill_seen_bssids (connection); - /* Ensure it's initial visibility is up-to-date */ - nm_settings_connection_recheck_visibility (connection); - /* Evil openconnect migration hack */ openconnect_migrate_hack (NM_CONNECTION (connection)); |