Move the AccountKind enum to Vala

This commit is contained in:
Gergely Polonkai 2016-03-03 12:45:57 +01:00
parent f203171443
commit b870802721
4 changed files with 9 additions and 23 deletions

View File

@ -93,13 +93,6 @@ namespace Matrix {
READ; READ;
} }
[CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_ACCOUNT_KIND_")]
public enum AccountKind {
DEFAULT,
USER,
GUEST;
}
[CCode (cheader_filename = "matrix-types.h")] [CCode (cheader_filename = "matrix-types.h")]
public class StateEvent { public class StateEvent {
public Json.Node? get_json_node(); public Json.Node? get_json_node();

View File

@ -17,6 +17,15 @@
*/ */
namespace Matrix { namespace Matrix {
/**
* User account types.
*/
public enum AccountKind {
DEFAULT, /// use the server default (usually {{{USER}}})
USER, /// normal user
GUEST; /// guest user
}
/** /**
* Event format received when synchronizing. * Event format received when synchronizing.
*/ */

View File

@ -211,16 +211,6 @@ G_DEFINE_QUARK(matrix-error-quark, matrix_error);
* Condition types for pushers. * Condition types for pushers.
*/ */
/**
* MatrixAccountKind:
* @MATRIX_ACCOUNT_KIND_DEFAULT: use the server default (usually
* %MATRIX_ACCOUNT_KIND_USER)
* @MATRIX_ACCOUNT_KIND_USER: normal user
* @MATRIX_ACCOUNT_KIND_GUEST: guest user
*
* User account types.
*/
/** /**
* MatrixEventDirection: * MatrixEventDirection:
* @MATRIX_EVENT_DIRECTION_FORWARD: List events after the specified * @MATRIX_EVENT_DIRECTION_FORWARD: List events after the specified

View File

@ -117,12 +117,6 @@ typedef enum {
MATRIX_PUSHER_CONDITION_KIND_ROOM_MEMBER_COUNT MATRIX_PUSHER_CONDITION_KIND_ROOM_MEMBER_COUNT
} MatrixPusherConditionKind; } MatrixPusherConditionKind;
typedef enum {
MATRIX_ACCOUNT_KIND_DEFAULT,
MATRIX_ACCOUNT_KIND_USER,
MATRIX_ACCOUNT_KIND_GUEST
} MatrixAccountKind;
typedef struct _MatrixStateEvent MatrixStateEvent; typedef struct _MatrixStateEvent MatrixStateEvent;
GType matrix_state_event_get_type(void); GType matrix_state_event_get_type(void);