diff --git a/src/c-api.vapi b/src/c-api.vapi index 5f6c5d6..37681fd 100644 --- a/src/c-api.vapi +++ b/src/c-api.vapi @@ -41,14 +41,6 @@ namespace Matrix { public static GLib.Quark quark (); } - [CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_ROOM_PRESET_")] - public enum RoomPreset { - NONE, - PRIVATE, - TRUSTED_PRIVATE, - PUBLIC; - } - [CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_ROOM_VISIBILITY_")] public enum RoomVisibility { DEFAULT, diff --git a/src/matrix-enums.vala b/src/matrix-enums.vala index 26a07bf..6a990db 100644 --- a/src/matrix-enums.vala +++ b/src/matrix-enums.vala @@ -92,6 +92,16 @@ namespace Matrix { SCALE; /// scale thumbnail to the requested size } + /** + * Preset values for matrix_api_create_room() calls. + */ + public enum RoomPreset { + NONE, /// no preset + PRIVATE, /// preset for private rooms + TRUSTED_PRIVATE, /// same as private rooms, but all users get the same power level as the room creator + PUBLIC; /// preset for public rooms + } + private int? _g_enum_nick_to_value(Type enum_type, string nick) { diff --git a/src/matrix-types.c b/src/matrix-types.c index 0a48e3f..9b2c96c 100644 --- a/src/matrix-types.c +++ b/src/matrix-types.c @@ -110,18 +110,6 @@ */ G_DEFINE_QUARK(matrix-error-quark, matrix_error); -/** - * MatrixRoomPreset: - * @MATRIX_ROOM_PRESET_NONE: no preset - * @MATRIX_ROOM_PRESET_PRIVATE: preset for private rooms - * @MATRIX_ROOM_PRESET_TRUSTED_PRIVATE: same as private rooms, but all - * users get the same power level - * as the room creator - * @MATRIX_ROOM_PRESET_PUBLIC: preset for public rooms - * - * Preset values for matrix_api_create_room() calls. - */ - /** * MatrixRoomVisibility: * @MATRIX_ROOM_VISIBILITY_DEFAULT: use a server-assigned value diff --git a/src/matrix-types.h b/src/matrix-types.h index 79c6bf4..3a2a066 100644 --- a/src/matrix-types.h +++ b/src/matrix-types.h @@ -72,13 +72,6 @@ typedef enum { #define MATRIX_ERROR matrix_error_quark() GQuark matrix_error_quark(void); -typedef enum { - MATRIX_ROOM_PRESET_NONE, - MATRIX_ROOM_PRESET_PRIVATE, - MATRIX_ROOM_PRESET_TRUSTED_PRIVATE, - MATRIX_ROOM_PRESET_PUBLIC -} MatrixRoomPreset; - typedef enum { MATRIX_ROOM_VISIBILITY_DEFAULT, MATRIX_ROOM_VISIBILITY_PUBLIC,