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

include: drop nm-settings-flags.h, move NMSecretAgentGetSecretsFlags

Browse Source 
For some reason, the flags used by o.fd.NM.SecretAgent.GetSecrets were
defined as both NMSecretAgentGetSecretsFlags in
libnm{,-glib}/nm-secret-agent.h, and then separately as
NMSettingsGetSecretsFlags in include/nm-settings-flags.h.
(NMSettingsGetSecretsFlags also had an additional internal-use-only
value, but that was added later after the duplication already
existed.)

Fix this by moving NMSecretAgentGetSecretsFlags from libnm to
nm-dbus-interface.h, adding the internal-use-only value to it as well,
updating the core code to use that, and then removing
nm-settings-flags.h.
This commit is contained in:
Dan Winship
2014-07-07 10:11:46 -04:00
parent 9a930b3e89
commit dc1b76432b
18 changed files with 73 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-activation-request.c
View File

@@ -106,7 +106,7 @@ get_secrets_cb (NMSettingsConnection *connection,
guint32
nm_act_request_get_secrets (NMActRequest *self,
const char *setting_name,
NMSettingsGetSecretsFlags flags,
NMSecretAgentGetSecretsFlags flags,
const char *hint,
NMActRequestSecretsFunc callback,
gpointer callback_data)
@@ -128,7 +128,7 @@ nm_act_request_get_secrets (NMActRequest *self,
info->callback_data = callback_data;
if (nm_active_connection_get_user_requested (NM_ACTIVE_CONNECTION (self)))
flags |= NM_SETTINGS_GET_SECRETS_FLAG_USER_REQUESTED;
flags |= NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED;
connection = nm_active_connection_get_connection (NM_ACTIVE_CONNECTION (self));
call_id = nm_settings_connection_get_secrets (NM_SETTINGS_CONNECTION (connection),