From 6409b7539858ed22382e7215224d9b05a997a2a2 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Thu, 3 Mar 2016 12:49:01 +0100 Subject: [PATCH] Move the EventDirection enum to Vala --- src/c-api.vapi | 6 ------ src/matrix-enums.vala | 8 ++++++++ src/matrix-types.c | 10 ---------- src/matrix-types.h | 5 ----- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/c-api.vapi b/src/c-api.vapi index a5a4c7e..5fd433d 100644 --- a/src/c-api.vapi +++ b/src/c-api.vapi @@ -82,12 +82,6 @@ namespace Matrix { PRIVATE; } - [CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_EVENT_DIRECTION_")] - public enum EventDirection { - FORWARD, - BACKWARD; - } - [CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_RECEIPT_TYPE_")] public enum ReceiptType { READ; diff --git a/src/matrix-enums.vala b/src/matrix-enums.vala index a89e30f..78e248e 100644 --- a/src/matrix-enums.vala +++ b/src/matrix-enums.vala @@ -26,6 +26,14 @@ namespace Matrix { GUEST; /// guest user } + /** + * Direction of events when requesting an event context. + */ + public enum EventDirection { + FORWARD, /// List events after the specified one + BACKWARD; /// List events before the specified one + } + /** * Event format received when synchronizing. */ diff --git a/src/matrix-types.c b/src/matrix-types.c index b62fb96..63cd3a4 100644 --- a/src/matrix-types.c +++ b/src/matrix-types.c @@ -211,16 +211,6 @@ G_DEFINE_QUARK(matrix-error-quark, matrix_error); * Condition types for pushers. */ -/** - * MatrixEventDirection: - * @MATRIX_EVENT_DIRECTION_FORWARD: List events after the specified - * one - * @MATRIX_EVENT_DIRECTION_BACKWARD: List events before the specified - * one - * - * Direction of events when requesting an event context. - */ - /** * MatrixReceiptType: * @MATRIX_RECEIPT_TYPE_READ: indicate that the message has been read diff --git a/src/matrix-types.h b/src/matrix-types.h index 540ce4a..767a851 100644 --- a/src/matrix-types.h +++ b/src/matrix-types.h @@ -93,11 +93,6 @@ typedef enum { MATRIX_ROOM_VISIBILITY_PRIVATE } MatrixRoomVisibility; -typedef enum { - MATRIX_EVENT_DIRECTION_FORWARD, - MATRIX_EVENT_DIRECTION_BACKWARD -} MatrixEventDirection; - typedef enum { MATRIX_RECEIPT_TYPE_READ } MatrixReceiptType;