diff options
| author | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:39 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:39 +0100 |
| commit | 2c032d8f1c6292c1338a615e6ec40252889ba85c (patch) | |
| tree | 1f77182220b2b0264288ba4a476ab47e5bc48716 /src/nm-activation-request.c | |
| parent | 33491bc4279481db8ae47213e34a6d695a0e8830 (diff) | |
Imported Upstream version 1.0.0 upstream/1.0.0
Diffstat (limited to 'src/nm-activation-request.c')
| -rw-r--r-- | src/nm-activation-request.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 9f9ee0f9..30ce7515 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -25,9 +25,8 @@ #include <stdlib.h> #include <sys/wait.h> #include <unistd.h> -#include <dbus/dbus-glib.h> -#include "libgsystem.h" +#include "gsystem-local-alloc.h" #include "nm-activation-request.h" #include "nm-logging.h" @@ -37,7 +36,7 @@ #include "nm-active-connection.h" #include "nm-settings-connection.h" #include "nm-posix-signals.h" - +#include "nm-auth-subject.h" G_DEFINE_TYPE (NMActRequest, nm_act_request, NM_TYPE_ACTIVE_CONNECTION) @@ -106,7 +105,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 +127,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), |