diff options
author | Guido Günther <agx@sigxcpu.org> | 2016-03-13 13:07:47 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2016-03-13 13:07:47 +0100 |
commit | d9619973de807f74da4fd595b7719385a6dcfc93 (patch) | |
tree | 7a48306d3ccf65be63e29a6c449e6321901876db /auth-dialog/main.c | |
parent | 4064e8bd795c70efe4a303cd36451a99ea67f8c4 (diff) | |
parent | 04ba0f1c1efc825d49e1486dcd18df59e1df0805 (diff) |
Merge branch 'nm-1.1'v1.1.0
Diffstat (limited to 'auth-dialog/main.c')
-rw-r--r-- | auth-dialog/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/auth-dialog/main.c b/auth-dialog/main.c index f482cf0..56d26dc 100644 --- a/auth-dialog/main.c +++ b/auth-dialog/main.c @@ -34,11 +34,11 @@ #define SECRET_API_SUBJECT_TO_CHANGE #include <libsecret/secret.h> -#include <nm-setting-vpn.h> -#include <nm-vpn-plugin-utils.h> -#include <nm-vpn-password-dialog.h> +#include <NetworkManager.h> +#include <nm-vpn-service-plugin.h> +#include <nma-vpn-password-dialog.h> -#include "src/nm-iodine-service.h" +#include "../src/nm-iodine-service-defines.h" #define KEYRING_UUID_TAG "connection-uuid" #define KEYRING_SN_TAG "setting-name" @@ -292,13 +292,13 @@ main (int argc, char *argv[]) g_option_context_parse (context, &argc, &argv, NULL); g_option_context_free (context); - if (!nm_vpn_plugin_utils_read_vpn_details (0, &data, &secrets)) { + if (!nm_vpn_service_plugin_read_vpn_details (0, &data, &secrets)) { fprintf (stderr, "Failed to read '%s' (%s) data and secrets from stdin.\n", vpn_name, vpn_uuid); return 1; } - nm_vpn_plugin_utils_get_secret_flags (secrets, NM_IODINE_KEY_PASSWORD, &pw_flags); + nm_vpn_service_plugin_get_secret_flags (secrets, NM_IODINE_KEY_PASSWORD, &pw_flags); if (!get_secrets (vpn_uuid, vpn_name, retry, allow_interaction, external_ui_mode, g_hash_table_lookup (secrets, NM_IODINE_KEY_PASSWORD), |