diff options
Diffstat (limited to 'src/nm-activation-request.h')
| -rw-r--r-- | src/nm-activation-request.h | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index a24369452..dac9d89af 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -25,7 +25,7 @@ #include <glib-object.h> #include "nm-connection.h" #include "nm-active-connection.h" -#include "nm-secrets-provider-interface.h" +#include "nm-settings-flags.h" #define NM_TYPE_ACT_REQUEST (nm_act_request_get_type ()) #define NM_ACT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACT_REQUEST, NMActRequest)) @@ -42,15 +42,6 @@ typedef struct { GObjectClass parent; /* Signals */ - void (*secrets_updated) (NMActRequest *req, - NMConnection *connection, - GSList *updated_settings, - RequestSecretsCaller caller); - void (*secrets_failed) (NMActRequest *req, - NMConnection *connection, - const char *setting, - RequestSecretsCaller caller); - void (*properties_changed) (NMActRequest *req, GHashTable *properties); } NMActRequestClass; @@ -59,6 +50,7 @@ GType nm_act_request_get_type (void); NMActRequest *nm_act_request_new (NMConnection *connection, const char *specific_object, gboolean user_requested, + gulong user_uid, gboolean assumed, gpointer *device); /* An NMDevice */ @@ -92,12 +84,22 @@ GObject * nm_act_request_get_device (NMActRequest *req); gboolean nm_act_request_get_assumed (NMActRequest *req); -gboolean nm_act_request_get_secrets (NMActRequest *req, - const char *setting_name, - gboolean request_new, - RequestSecretsCaller caller, - const char *hint1, - const char *hint2); +/* Secrets handling */ + +typedef void (*NMActRequestSecretsFunc) (NMActRequest *req, + guint32 call_id, + NMConnection *connection, + GError *error, + gpointer user_data); + +guint32 nm_act_request_get_secrets (NMActRequest *req, + const char *setting_name, + NMSettingsGetSecretsFlags flags, + const char *hint, + NMActRequestSecretsFunc callback, + gpointer callback_data); + +void nm_act_request_cancel_secrets (NMActRequest *req, guint32 call_id); #endif /* NM_ACTIVATION_REQUEST_H */ |