Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 29 insertions, 28 deletions

diff --git a/src/settings/nm-agent-manager.h b/src/settings/nm-agent-manager.h
index ac29df22..2f505537 100644
--- a/src/settings/nm-agent-manager.h
+++ b/src/settings/nm-agent-manager.h
@@ -21,11 +21,10 @@
 #ifndef __NETWORKMANAGER_AGENT_MANAGER_H__
 #define __NETWORKMANAGER_AGENT_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 #include <nm-connection.h>
+
+#include "nm-exported-object.h"
 #include "nm-secret-agent.h"
-#include "nm-types.h"
 
 #define NM_TYPE_AGENT_MANAGER            (nm_agent_manager_get_type ())
 #define NM_AGENT_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AGENT_MANAGER, NMAgentManager))
@@ -34,12 +33,15 @@
 #define NM_IS_AGENT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_AGENT_MANAGER))
 #define NM_AGENT_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_AGENT_MANAGER, NMAgentManagerClass))
 
+struct _NMAgentManagerCallId;
+typedef struct _NMAgentManagerCallId *NMAgentManagerCallId;
+
 struct _NMAgentManager {
-	GObject parent;
+	NMExportedObject parent;
 };
 
 typedef struct {
-	GObjectClass parent;
+	NMExportedObjectClass parent;
 
 	/* Signals */
 	void (*agent_registered)   (NMAgentManager *agent_mgr, NMSecretAgent *agent);
@@ -51,39 +53,38 @@ NMAgentManager *nm_agent_manager_get (void);
 
 /* If no agent fulfilled the secrets request, agent_dbus_owner will be NULL */
 typedef void (*NMAgentSecretsResultFunc) (NMAgentManager *manager,
-                                          guint32 call_id,
+                                          NMAgentManagerCallId call_id,
                                           const char *agent_dbus_owner,
                                           const char *agent_uname,
                                           gboolean agent_has_modify,
                                           const char *setting_name,
                                           NMSecretAgentGetSecretsFlags flags,
-                                          GHashTable *secrets,
+                                          GVariant *secrets,
                                           GError *error,
-                                          gpointer user_data,
-                                          gpointer other_data2,
-                                          gpointer other_data3);
-
-guint32 nm_agent_manager_get_secrets (NMAgentManager *manager,
-                                      NMConnection *connection,
-                                      NMAuthSubject *subject,
-                                      GHashTable *existing_secrets,
-                                      const char *setting_name,
-                                      NMSecretAgentGetSecretsFlags flags,
-                                      const char **hints,
-                                      NMAgentSecretsResultFunc callback,
-                                      gpointer callback_data,
-                                      gpointer other_data2,
-                                      gpointer other_data3);
+                                          gpointer user_data);
+
+NMAgentManagerCallId nm_agent_manager_get_secrets (NMAgentManager *manager,
+                                                   const char *path,
+                                                   NMConnection *connection,
+                                                   NMAuthSubject *subject,
+                                                   GVariant *existing_secrets,
+                                                   const char *setting_name,
+                                                   NMSecretAgentGetSecretsFlags flags,
+                                                   const char **hints,
+                                                   NMAgentSecretsResultFunc callback,
+                                                   gpointer callback_data);
 
 void nm_agent_manager_cancel_secrets (NMAgentManager *manager,
-                                      guint32 request_id);
+                                      NMAgentManagerCallId request_id);
 
-guint32 nm_agent_manager_save_secrets (NMAgentManager *manager,
-                                       NMConnection *connection,
-                                       NMAuthSubject *subject);
+void nm_agent_manager_save_secrets (NMAgentManager *manager,
+                                    const char *path,
+                                    NMConnection *connection,
+                                    NMAuthSubject *subject);
 
-guint32 nm_agent_manager_delete_secrets (NMAgentManager *manager,
-                                         NMConnection *connection);
+void nm_agent_manager_delete_secrets (NMAgentManager *manager,
+                                      const char *path,
+                                      NMConnection *connection);
 
 NMSecretAgent *nm_agent_manager_get_agent_by_user (NMAgentManager *manager,
                                                    const char *username);