diff --git a/src/matrix-api.c b/src/matrix-api.c index 1fd0189..327c10a 100644 --- a/src/matrix-api.c +++ b/src/matrix-api.c @@ -1679,7 +1679,7 @@ matrix_api_versions(MatrixAPI *api, * finished * @user_data: (closure): user data to pass to the callback function * @callback - * @type: the login type to use + * @login_type: the login type to use * @content: (allow-none): parameters to pass for the login request * @error: return location for a #GError, or %NULL * @@ -1690,14 +1690,14 @@ void matrix_api_login(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, - const gchar *type, + const gchar *login_type, const JsonNode *content, GError **error) { g_return_if_fail(MATRIX_IS_API(api)); MATRIX_API_GET_IFACE(api) - ->login(api, callback, user_data, type, content, error); + ->login(api, callback, user_data, login_type, content, error); } /** diff --git a/src/matrix-api.h b/src/matrix-api.h index 22bd1c2..cf47b05 100644 --- a/src/matrix-api.h +++ b/src/matrix-api.h @@ -368,7 +368,7 @@ struct _MatrixAPIInterface { void (*login)(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, - const gchar *type, + const gchar *login_type, const JsonNode *content, GError **error); void (*token_refresh)(MatrixAPI *api, @@ -789,7 +789,7 @@ void matrix_api_versions(MatrixAPI *api, void matrix_api_login(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, - const gchar *type, + const gchar *login_type, const JsonNode *content, GError **error); void matrix_api_token_refresh(MatrixAPI *api, diff --git a/src/matrix-http-api.c b/src/matrix-http-api.c index bf37183..1d4715e 100644 --- a/src/matrix-http-api.c +++ b/src/matrix-http-api.c @@ -837,7 +837,7 @@ static void i_login(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, - const gchar *type, + const gchar *login_type, const JsonNode *content, GError **error) { @@ -846,7 +846,7 @@ i_login(MatrixAPI *api, body = json_node_copy((JsonNode *)content); root_object = json_node_get_object(body); - json_object_set_string_member(root_object, "type", type); + json_object_set_string_member(root_object, "type", login_type); _send(MATRIX_HTTP_API(api), callback, user_data,