From 8ce974e19589417c861102aba5e6cb10f2ea9600 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Sat, 16 Jan 2016 15:06:22 +0100 Subject: [PATCH] =?UTF-8?q?Change=20set=5Faccount=5Fdata=E2=80=99s=20type?= =?UTF-8?q?=20param=20to=20event=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is for not to clash with some languages (like Python) --- src/matrix-api.c | 8 ++++---- src/matrix-api.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/matrix-api.c b/src/matrix-api.c index f7f89f6..85254b1 100644 --- a/src/matrix-api.c +++ b/src/matrix-api.c @@ -1995,8 +1995,8 @@ matrix_api_register_account(MatrixAPI *api, * ID * @room_id: (allow-none): the room to set account data for. If %NULL, * the account data will be set globally - * @type: the event type of the account data to set. Custom types - * should be namespaced to avoid clashes. + * @event_type: the event type of the account data to set. Custom + * types should be namespaced to avoid clashes * @content: (transfer full): the content of the account data * @error: return location for a #GError, or %NULL * @@ -2010,7 +2010,7 @@ matrix_api_set_account_data(MatrixAPI *api, gpointer user_data, const gchar *user_id, const gchar *room_id, - const gchar *type, + const gchar *event_type, JsonNode *content, GError **error) { @@ -2019,7 +2019,7 @@ matrix_api_set_account_data(MatrixAPI *api, MATRIX_API_GET_IFACE(api) ->set_account_data(api, callback, user_data, - user_id, room_id, type, content, error); + user_id, room_id, event_type, content, error); } /** diff --git a/src/matrix-api.h b/src/matrix-api.h index ae50c3e..d367eac 100644 --- a/src/matrix-api.h +++ b/src/matrix-api.h @@ -434,7 +434,7 @@ struct _MatrixAPIInterface { gpointer user_data, const gchar *user_id, const gchar *room_id, - const gchar *type, + const gchar *event_type, JsonNode *content, GError **error); void (*get_room_tags)(MatrixAPI *api, @@ -855,7 +855,7 @@ void matrix_api_set_account_data(MatrixAPI *api, gpointer user_data, const gchar *user_id, const gchar *room_id, - const gchar *type, + const gchar *event_type, JsonNode *content, GError **error); void matrix_api_get_room_tags(MatrixAPI *api,