core: refactor NMActRequestGetSecretsCallId typedef not to be a pointer to struct

Typedefs to structs are fine, but a typedef for a pointer seems confusing to
me. Let's avoid it.

7 files changed, 22 insertions, 22 deletions

diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 7807100f5b..3ca86e06a6 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -104,7 +104,7 @@ typedef struct _NMDeviceEthernetPrivate {
 	char *              s390_nettype;
 	GHashTable *        s390_options;
 
-	NMActRequestGetSecretsCallId wired_secrets_id;
+	NMActRequestGetSecretsCallId *wired_secrets_id;
 
 	/* PPPoE */
 	NMPPPManager *ppp_manager;
@@ -416,7 +416,7 @@ supplicant_interface_release (NMDeviceEthernet *self)
 
 static void
 wired_secrets_cb (NMActRequest *req,
-                  NMActRequestGetSecretsCallId call_id,
+                  NMActRequestGetSecretsCallId *call_id,
                   NMSettingsConnection *connection,
                   GError *error,
                   gpointer user_data)
diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c
index 9558727860..5ef8f93836 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/devices/nm-device-macsec.c
@@ -71,7 +71,7 @@ typedef struct {
 	gulong parent_state_id;
 	Supplicant supplicant;
 	guint supplicant_timeout_id;
-	NMActRequestGetSecretsCallId macsec_secrets_id;
+	NMActRequestGetSecretsCallId *macsec_secrets_id;
 } NMDeviceMacsecPrivate;
 
 struct _NMDeviceMacsec {
@@ -276,7 +276,7 @@ supplicant_iface_assoc_cb (NMSupplicantInterface *iface,
 
 static void
 macsec_secrets_cb (NMActRequest *req,
-                   NMActRequestGetSecretsCallId call_id,
+                   NMActRequestGetSecretsCallId *call_id,
                    NMSettingsConnection *connection,
                    GError *error,
                    gpointer user_data)
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 5e92f47b76..b13ae2c77e 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -107,7 +107,7 @@ typedef struct {
 
 	NM80211Mode       mode;
 
-	NMActRequestGetSecretsCallId wifi_secrets_id;
+	NMActRequestGetSecretsCallId *wifi_secrets_id;
 
 	guint             periodic_source_id;
 	guint             link_timeout_id;
@@ -1786,7 +1786,7 @@ cleanup_supplicant_failures (NMDeviceWifi *self)
 
 static void
 wifi_secrets_cb (NMActRequest *req,
-                 NMActRequestGetSecretsCallId call_id,
+                 NMActRequestGetSecretsCallId *call_id,
                  NMSettingsConnection *connection,
                  GError *error,
                  gpointer user_data)
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 77495b62d8..1c32791f11 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -94,7 +94,7 @@ typedef struct _NMModemPrivate {
 
 	NMActRequest *act_request;
 	guint32 secrets_tries;
-	NMActRequestGetSecretsCallId secrets_id;
+	NMActRequestGetSecretsCallId *secrets_id;
 
 	guint32 mm_ip_timeout;
 
@@ -880,7 +880,7 @@ cancel_get_secrets (NMModem *self)
 
 static void
 modem_secrets_cb (NMActRequest *req,
-                  NMActRequestGetSecretsCallId call_id,
+                  NMActRequestGetSecretsCallId *call_id,
                   NMSettingsConnection *connection,
                   GError *error,
                   gpointer user_data)
diff --git a/src/nm-act-request.c b/src/nm-act-request.c
index 6d8bb0652e..da27789a04 100644
--- a/src/nm-act-request.c
+++ b/src/nm-act-request.c
@@ -171,7 +171,7 @@ get_secrets_cb (NMSettingsConnection *connection,
  *
  * Returns: a call-id.
  */
-NMActRequestGetSecretsCallId
+NMActRequestGetSecretsCallId *
 nm_act_request_get_secrets (NMActRequest *self,
                             gboolean ref_self,
                             const char *setting_name,
@@ -247,7 +247,7 @@ _do_cancel_secrets (NMActRequest *self, GetSecretsInfo *info, gboolean is_dispos
  * synchronously.
  */
 void
-nm_act_request_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId call_id)
+nm_act_request_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId *call_id)
 {
 	NMActRequestPrivate *priv;
 
diff --git a/src/nm-act-request.h b/src/nm-act-request.h
index b854940442..5d1c9dfd3b 100644
--- a/src/nm-act-request.h
+++ b/src/nm-act-request.h
@@ -32,7 +32,7 @@
 #define NM_ACT_REQUEST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACT_REQUEST, NMActRequestClass))
 
 struct _NMActRequestGetSecretsCallId;
-typedef struct _NMActRequestGetSecretsCallId *NMActRequestGetSecretsCallId;
+typedef struct _NMActRequestGetSecretsCallId NMActRequestGetSecretsCallId;
 
 GType nm_act_request_get_type (void);
 
@@ -58,20 +58,20 @@ void                  nm_act_request_add_share_rule (NMActRequest *req,
 /* Secrets handling */
 
 typedef void (*NMActRequestSecretsFunc) (NMActRequest *req,
-                                         NMActRequestGetSecretsCallId call_id,
+                                         NMActRequestGetSecretsCallId *call_id,
                                          NMSettingsConnection *connection,
                                          GError *error,
                                          gpointer user_data);
 
-NMActRequestGetSecretsCallId nm_act_request_get_secrets (NMActRequest *req,
-                                                         gboolean take_ref,
-                                                         const char *setting_name,
-                                                         NMSecretAgentGetSecretsFlags flags,
-                                                         const char *hint,
-                                                         NMActRequestSecretsFunc callback,
-                                                         gpointer callback_data);
+NMActRequestGetSecretsCallId *nm_act_request_get_secrets (NMActRequest *req,
+                                                          gboolean take_ref,
+                                                          const char *setting_name,
+                                                          NMSecretAgentGetSecretsFlags flags,
+                                                          const char *hint,
+                                                          NMActRequestSecretsFunc callback,
+                                                          gpointer callback_data);
 
-void nm_act_request_cancel_secrets (NMActRequest *req, NMActRequestGetSecretsCallId call_id);
+void nm_act_request_cancel_secrets (NMActRequest *req, NMActRequestGetSecretsCallId *call_id);
 void nm_act_request_clear_secrets (NMActRequest *self);
 
 #endif /* __NM_ACT_REQUEST_H__ */
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
index 3ef3f3dc84..7dd6a9b95c 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/ppp/nm-ppp-manager.c
@@ -96,7 +96,7 @@ typedef struct {
 
 	NMActRequest *act_req;
 	GDBusMethodInvocation *pending_secrets_context;
-	NMActRequestGetSecretsCallId secrets_id;
+	NMActRequestGetSecretsCallId *secrets_id;
 	const char *secrets_setting_name;
 
 	guint ppp_watch_id;
@@ -287,7 +287,7 @@ extract_details_from_connection (NMConnection *connection,
 
 static void
 ppp_secrets_cb (NMActRequest *req,
-                NMActRequestGetSecretsCallId call_id,
+                NMActRequestGetSecretsCallId *call_id,
                 NMSettingsConnection *settings_connection, /* unused (we pass NULL here) */
                 GError *error,
                 gpointer user_data)