Imported Upstream version 0.8.4.0upstream/0.8.4.0

1 files changed, 16 insertions, 18 deletions

diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h
index dac9d89af..a24369452 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-settings-flags.h"
+#include "nm-secrets-provider-interface.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,6 +42,15 @@ 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;
 
@@ -50,7 +59,6 @@ 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 */
 
@@ -84,22 +92,12 @@ GObject *     nm_act_request_get_device (NMActRequest *req);
 
 gboolean      nm_act_request_get_assumed (NMActRequest *req);
 
-/* 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);
+gboolean nm_act_request_get_secrets    (NMActRequest *req,
+                                        const char *setting_name,
+                                        gboolean request_new,
+                                        RequestSecretsCaller caller,
+                                        const char *hint1,
+                                        const char *hint2);
 
 #endif /* NM_ACTIVATION_REQUEST_H */