From f9542d2f0ccd155a71a09c61722b442523690c25 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Thu, 3 Mar 2016 14:23:25 +0100 Subject: [PATCH] Move the ReceiptType enum to Vala --- src/c-api.vapi | 5 ----- src/matrix-enums.vala | 7 +++++++ src/matrix-types.c | 7 ------- src/matrix-types.h | 4 ---- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/c-api.vapi b/src/c-api.vapi index 7b3aa6c..5f6c5d6 100644 --- a/src/c-api.vapi +++ b/src/c-api.vapi @@ -56,11 +56,6 @@ namespace Matrix { PRIVATE; } - [CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_RECEIPT_TYPE_")] - public enum ReceiptType { - READ; - } - [CCode (cheader_filename = "matrix-types.h")] public class StateEvent { public Json.Node? get_json_node(); diff --git a/src/matrix-enums.vala b/src/matrix-enums.vala index 6a994a4..26a07bf 100644 --- a/src/matrix-enums.vala +++ b/src/matrix-enums.vala @@ -76,6 +76,13 @@ namespace Matrix { UNDERRIDE; /// lowest priority rules } + /** + * Receipt types of acknowledgment. + */ + public enum ReceiptType { + READ; /// indicate that the message has been read + } + /** * Resizing methods for matrix_api_media_thumbnail(). */ diff --git a/src/matrix-types.c b/src/matrix-types.c index dd6bfcb..0a48e3f 100644 --- a/src/matrix-types.c +++ b/src/matrix-types.c @@ -135,13 +135,6 @@ G_DEFINE_QUARK(matrix-error-quark, matrix_error); * rules. */ -/** - * MatrixReceiptType: - * @MATRIX_RECEIPT_TYPE_READ: indicate that the message has been read - * - * Receipt types of acknowledgment. - */ - /** * MatrixStateEvent: * diff --git a/src/matrix-types.h b/src/matrix-types.h index ff24b14..79c6bf4 100644 --- a/src/matrix-types.h +++ b/src/matrix-types.h @@ -85,10 +85,6 @@ typedef enum { MATRIX_ROOM_VISIBILITY_PRIVATE } MatrixRoomVisibility; -typedef enum { - MATRIX_RECEIPT_TYPE_READ -} MatrixReceiptType; - typedef struct _MatrixStateEvent MatrixStateEvent; GType matrix_state_event_get_type(void);