From 68833931e051d804a5f8caae0f577ca3466fc43e Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Fri, 15 Jan 2016 16:38:39 +0100
Subject: [PATCH] =?UTF-8?q?Change=20send=5Fevent=5Frecepit=5Ftype=E2=80=99?=
 =?UTF-8?q?s=20type=20param=20to=20receipt=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 | 6 +++---
 src/matrix-api.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/matrix-api.c b/src/matrix-api.c
index 133b806..46cddec 100644
--- a/src/matrix-api.c
+++ b/src/matrix-api.c
@@ -1284,7 +1284,7 @@ matrix_api_list_room_messages(MatrixAPI *api,
  * @user_data: (closure): user data to pass to the callback function
  *             @callback
  * @room_id: the room in which to send the event
- * @type: type of the receipt
+ * @receipt_type: type of the receipt
  * @event_id: the event ID to acknowledge up to
  * @receipt: extra receipt information to attach. Note that the server
  *           will automatically attach the <code>ts</code> field
@@ -1297,7 +1297,7 @@ matrix_api_send_event_receipt(MatrixAPI *api,
                               MatrixAPICallback callback,
                               gpointer user_data,
                               const gchar *room_id,
-                              MatrixAPIReceiptType type,
+                              MatrixAPIReceiptType receipt_type,
                               const gchar *event_id,
                               JsonNode *receipt,
                               GError **error)
@@ -1307,7 +1307,7 @@ matrix_api_send_event_receipt(MatrixAPI *api,
     MATRIX_API_GET_IFACE(api)
         ->send_event_receipt(api,
                              callback, user_data,
-                             room_id, type, event_id, receipt,
+                             room_id, receipt_type, event_id, receipt,
                              error);
 }
 
diff --git a/src/matrix-api.h b/src/matrix-api.h
index 5036529..7cdbbcf 100644
--- a/src/matrix-api.h
+++ b/src/matrix-api.h
@@ -280,7 +280,7 @@ struct _MatrixAPIInterface {
                                MatrixAPICallback callback,
                                gpointer user_data,
                                const gchar *room_id,
-                               MatrixAPIReceiptType type,
+                               MatrixAPIReceiptType receipt_type,
                                const gchar *event_id,
                                JsonNode *receipt,
                                GError **error);
@@ -697,7 +697,7 @@ void matrix_api_send_event_receipt(MatrixAPI *api,
                                    MatrixAPICallback callback,
                                    gpointer user_data,
                                    const gchar *room_id,
-                                   MatrixAPIReceiptType type,
+                                   MatrixAPIReceiptType receipt_type,
                                    const gchar *event_id,
                                    JsonNode *receipt,
                                    GError **error);