fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 03:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: drop internal typedef GetSecretsInfo for NMSecretAgentCallId

Browse source 
Using an internal alias for the type is just confusing. Drop it.
This commit is contained in:
Thomas Haller 2017-11-24 16:24:40 +01:00
parent e5e291b65f
commit 370dc8883f
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/nm-act-request.c
View file

@ -97,14 +97,12 @@ struct _NMActRequestGetSecretsCallId {
bool has_ref; bool has_ref;
}; };
typedef struct _NMActRequestGetSecretsCallId GetSecretsInfo; static NMActRequestGetSecretsCallId *
static GetSecretsInfo *
_get_secrets_info_new (NMActRequest *self, gboolean ref_self, NMActRequestSecretsFunc callback, gpointer callback_data) _get_secrets_info_new (NMActRequest *self, gboolean ref_self, NMActRequestSecretsFunc callback, gpointer callback_data)
{ {
GetSecretsInfo *info; NMActRequestGetSecretsCallId *info;
info = g_slice_new0 (GetSecretsInfo); info = g_slice_new0 (NMActRequestGetSecretsCallId);
info->has_ref = ref_self; info->has_ref = ref_self;
info->self = ref_self ? g_object_ref (self) : self; info->self = ref_self ? g_object_ref (self) : self;
info->callback = callback; info->callback = callback;
@ -114,11 +112,11 @@ _get_secrets_info_new (NMActRequest *self, gboolean ref_self, NMActRequestSecret
} }
static void static void
_get_secrets_info_free (GetSecretsInfo *info) _get_secrets_info_free (NMActRequestGetSecretsCallId *info)
{ {
if (info->has_ref) if (info->has_ref)
g_object_unref (info->self); g_object_unref (info->self);
g_slice_free (GetSecretsInfo, info); g_slice_free (NMActRequestGetSecretsCallId, info);
} }
static void static void
@ -129,7 +127,7 @@ get_secrets_cb (NMSettingsConnection *connection,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
{ {
GetSecretsInfo *info = user_data; NMActRequestGetSecretsCallId *info = user_data;
NMActRequestPrivate *priv; NMActRequestPrivate *priv;
g_return_if_fail (info && info->call_id == call_id_s); g_return_if_fail (info && info->call_id == call_id_s);
@ -181,7 +179,7 @@ nm_act_request_get_secrets (NMActRequest *self,
gpointer callback_data) gpointer callback_data)
{ {
NMActRequestPrivate *priv; NMActRequestPrivate *priv;
GetSecretsInfo *info; NMActRequestGetSecretsCallId *info;
NMSettingsConnectionCallId call_id_s; NMSettingsConnectionCallId call_id_s;
NMSettingsConnection *settings_connection; NMSettingsConnection *settings_connection;
NMConnection *applied_connection; NMConnection *applied_connection;
@ -215,7 +213,7 @@ nm_act_request_get_secrets (NMActRequest *self,
} }
static void static void
_do_cancel_secrets (NMActRequest *self, GetSecretsInfo *info, gboolean is_disposing) _do_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId *info, gboolean is_disposing)
{ {
NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self); NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self);