gergely
/
matrix-glib-sdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move MatrixAPIEventFormat enum to matrix-api-types.h

This commit is contained in:
Gergely Polonkai 2016-01-07 16:57:10 +01:00
parent 90a360ecd6
commit 512020a0ea
6 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/reference/matrix-glib/matrix-glib-sections.txt
View File

@ -19,6 +19,9 @@ matrix_client_get_type
<FILE>matrix-api-types</FILE>
<TITLE>Fundamental types for MatrixAPI</TITLE>
<SUBSECTION>
MatrixAPIEventFormat
<SUBSECTION>
MatrixAPIFilterRules
matrix_api_filter_rules_new
@ -70,6 +73,8 @@ matrix_api_room_filter_get_json_node
matrix_api_room_filter_get_json_data
<SUBSECTION Standard>
MATRIX_TYPE_API_EVENT_FORMAT
matrix_api_event_format_get_type
MATRIX_TYPE_API_FILTER_RULES
matrix_api_filter_rules_get_type
MATRIX_TYPE_API_ROOM_FILTER
@ -184,7 +189,6 @@ MatrixAPIError
MATRIX_API_ERROR
<SUBSECTION>
MatrixAPIEventFormat
MatrixAPIFilter
MatrixAPIStateEvent
MatrixAPI3PidCredential
@ -202,8 +206,6 @@ MatrixApiPrivate
matrix_api_get_type
MATRIX_TYPE_API_EVENT_DIRECTION
matrix_api_event_direction_get_type
MATRIX_TYPE_API_EVENT_FORMAT
matrix_api_event_format_get_type
MATRIX_TYPE_API_PRESENCE
matrix_api_presence_get_type
MATRIX_TYPE_API_PUSHER_CONDITION_KIND

5
src/Makefile.am
View File

@ -15,7 +15,10 @@ INST_H_BUILT_FILES = \
matrix-enumtypes.h \
$(NULL)
matrix_enum_headers = matrix-api.h
matrix_enum_headers = \
matrix-api.h \
matrix-api-types.h \
$(NULL)
libmatrix_glib_0_0_la_SOURCES = \
matrix-client.c \

15
src/matrix-api-types.c
View File

@ -28,6 +28,20 @@
* communication with the homeserver.
*/
/**
* MatrixAPIEventFormat:
* @MATRIX_API_EVENT_FORMAT_DEFAULT: event format will be omitted from
* the filter, so the server will
* use its default (usually
* @MATRIX_API_EVENT_FORMAT_FEDERATION)
* @MATRIX_API_EVENT_FORMAT_CLIENT: return the events in a format
* suitable for clients
* @MATRIX_API_EVENT_FORMAT_FEDERATION: return the raw event as
* receieved over federation
*
* Event format received when synchronizing.
*/
/**
* MatrixAPIFilterRules: (ref-func matrix_api_filter_rules_ref) (unref-func matrix_api_filter_rules_unref)
*
@ -757,6 +771,7 @@ matrix_api_filter_rules_get_json_data(MatrixAPIFilterRules *rules,
json_node_free(node);
data = json_generator_to_data(generator, datalen);
g_object_unref(generator);
return data;
}

6
src/matrix-api-types.h
View File

@ -24,6 +24,12 @@
G_BEGIN_DECLS
typedef enum {
MATRIX_API_EVENT_FORMAT_DEFAULT,
MATRIX_API_EVENT_FORMAT_CLIENT,
MATRIX_API_EVENT_FORMAT_FEDERATION
} MatrixAPIEventFormat;
typedef struct _MatrixAPIFilterRules MatrixAPIFilterRules;
GType matrix_api_filter_rules_get_type(void);

14
src/matrix-api.c
View File

@ -237,20 +237,6 @@
* Receipt types of acknowledgment.
*/
/**
* MatrixAPIEventFormat:
* @MATRIX_API_EVENT_FORMAT_DEFAULT: event format will be omitted from
* the filter, so the server will
* use its default (usually
* @MATRIX_API_EVENT_FORMAT_FEDERATION)
* @MATRIX_API_EVENT_FORMAT_CLIENT: return the events in a format
* suitable for clients
* @MATRIX_API_EVENT_FORMAT_FEDERATION: return the raw event as
* receieved over federation
*
* Event format received when synchronizing.
*/
/**
* MatrixAPIPusher:
* @app_display_name: a string that will allow the user to identify

6
src/matrix-api.h
View File

@ -82,12 +82,6 @@ typedef enum {
MATRIX_API_EVENT_DIRECTION_BACKWARD
} MatrixAPIEventDirection;
typedef enum {
MATRIX_API_EVENT_FORMAT_DEFAULT,
MATRIX_API_EVENT_FORMAT_CLIENT,
MATRIX_API_EVENT_FORMAT_FEDERATION
} MatrixAPIEventFormat;
typedef enum {
MATRIX_API_RECEIPT_TYPE_READ
} MatrixAPIReceiptType;