From d0c91971a50fcfa7a2c2f7c18a357191fc76216b Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Sun, 14 Jul 2019 13:09:51 +0200 Subject: pluma-document-output-stream: avoid 'g_type_class_add_private' --- pluma/pluma-document-output-stream.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pluma/pluma-document-output-stream.c b/pluma/pluma-document-output-stream.c index 6fe662c0..9ccdb742 100644 --- a/pluma/pluma-document-output-stream.c +++ b/pluma/pluma-document-output-stream.c @@ -34,10 +34,6 @@ * there is no I/O involved and should be accessed only by the main * thread */ -#define PLUMA_DOCUMENT_OUTPUT_STREAM_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),\ - PLUMA_TYPE_DOCUMENT_OUTPUT_STREAM,\ - PlumaDocumentOutputStreamPrivate)) - #define MAX_UNICHAR_LEN 6 struct _PlumaDocumentOutputStreamPrivate @@ -58,7 +54,7 @@ enum PROP_DOCUMENT }; -G_DEFINE_TYPE (PlumaDocumentOutputStream, pluma_document_output_stream, G_TYPE_OUTPUT_STREAM) +G_DEFINE_TYPE_WITH_PRIVATE (PlumaDocumentOutputStream, pluma_document_output_stream, G_TYPE_OUTPUT_STREAM) static gssize pluma_document_output_stream_write (GOutputStream *stream, const void *buffer, @@ -169,14 +165,12 @@ pluma_document_output_stream_class_init (PlumaDocumentOutputStreamClass *klass) PLUMA_TYPE_DOCUMENT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_type_class_add_private (object_class, sizeof (PlumaDocumentOutputStreamPrivate)); } static void pluma_document_output_stream_init (PlumaDocumentOutputStream *stream) { - stream->priv = PLUMA_DOCUMENT_OUTPUT_STREAM_GET_PRIVATE (stream); + stream->priv = pluma_document_output_stream_get_instance_private (stream); stream->priv->buffer = NULL; stream->priv->buflen = 0; -- cgit v1.2.1