aboutsummaryrefslogtreecommitdiffstats
path: root/matrix-room.c
diff options
context:
space:
mode:
authorEion Robb <eion@robbmob.com>2017-05-28 14:45:26 +1200
committerEion Robb <eion@robbmob.com>2017-05-28 14:45:26 +1200
commitc426fb952d8bf985c2dc956db1bede4d35fccc1c (patch)
tree286aac4127d23e3a9d08db05bc3e5547916a054c /matrix-room.c
parent5988e14f1ad6d5f4fd00119ef1b116b7d0d5d540 (diff)
downloadpurple-matrix-c426fb952d8bf985c2dc956db1bede4d35fccc1c.tar.gz
Responding to PR comments
* Comment about using state table for ephermal events * Move JSON handling into matrix-api
Diffstat (limited to 'matrix-room.c')
-rw-r--r--matrix-room.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/matrix-room.c b/matrix-room.c
index ea38efc..4eae41f 100644
--- a/matrix-room.c
+++ b/matrix-room.c
@@ -1261,23 +1261,15 @@ void matrix_room_send_image(PurpleConversation *conv, int imgstore_id,
*/
void matrix_room_send_typing(PurpleConversation *conv, gboolean typing)
{
- JsonObject *content;
MatrixConnectionData *acct;
PurpleConnection *pc = conv->account->gc;
acct = purple_connection_get_protocol_data(pc);
- content = json_object_new();
- json_object_set_boolean_member(content, "typing", typing);
- if (typing == TRUE) {
- json_object_set_int_member(content, "timeout", 25000);
- }
-
// Don't check callbacks as it's inconsequential whether typing notifications go through
- matrix_api_typing(acct, conv->name, content,
+ matrix_api_typing(acct, conv->name, typing, 25000,
NULL, NULL, NULL, NULL);
- json_object_unref(content);
}
/**