From 687362e6f47490314ba7a93c1ded37bb40830ea6 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Mon, 15 Jul 2019 20:26:40 +0200 Subject: pluma-gio-document-saver: avoid 'g_type_class_add_private' --- pluma/pluma-gio-document-saver.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pluma/pluma-gio-document-saver.c b/pluma/pluma-gio-document-saver.c index b9bb657e..3ba86fe7 100644 --- a/pluma/pluma-gio-document-saver.c +++ b/pluma/pluma-gio-document-saver.c @@ -57,10 +57,6 @@ typedef struct #define REMOTE_QUERY_ATTRIBUTES G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," \ G_FILE_ATTRIBUTE_TIME_MODIFIED -#define PLUMA_GIO_DOCUMENT_SAVER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \ - PLUMA_TYPE_GIO_DOCUMENT_SAVER, \ - PlumaGioDocumentSaverPrivate)) - static void pluma_gio_document_saver_save (PlumaDocumentSaver *saver, GTimeVal *old_mtime); static goffset pluma_gio_document_saver_get_file_size (PlumaDocumentSaver *saver); @@ -84,7 +80,7 @@ struct _PlumaGioDocumentSaverPrivate GError *error; }; -G_DEFINE_TYPE(PlumaGioDocumentSaver, pluma_gio_document_saver, PLUMA_TYPE_DOCUMENT_SAVER) +G_DEFINE_TYPE_WITH_PRIVATE (PlumaGioDocumentSaver, pluma_gio_document_saver, PLUMA_TYPE_DOCUMENT_SAVER) static void pluma_gio_document_saver_dispose (GObject *object) @@ -167,14 +163,12 @@ pluma_gio_document_saver_class_init (PlumaGioDocumentSaverClass *klass) saver_class->save = pluma_gio_document_saver_save; saver_class->get_file_size = pluma_gio_document_saver_get_file_size; saver_class->get_bytes_written = pluma_gio_document_saver_get_bytes_written; - - g_type_class_add_private (object_class, sizeof(PlumaGioDocumentSaverPrivate)); } static void pluma_gio_document_saver_init (PlumaGioDocumentSaver *gvsaver) { - gvsaver->priv = PLUMA_GIO_DOCUMENT_SAVER_GET_PRIVATE (gvsaver); + gvsaver->priv = pluma_gio_document_saver_get_instance_private (gvsaver); gvsaver->priv->cancellable = g_cancellable_new (); gvsaver->priv->error = NULL; -- cgit v1.2.1