[libsoup/wip/withprivate: 20/26] converter-wrapper: port to the new private api



commit d78816c377862588fc2083a0efc2caaeb7a0475a
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Nov 7 11:03:59 2016 +0100

    converter-wrapper: port to the new private api

 libsoup/soup-converter-wrapper.c |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/libsoup/soup-converter-wrapper.c b/libsoup/soup-converter-wrapper.c
index d1837e6..133a3eb 100644
--- a/libsoup/soup-converter-wrapper.c
+++ b/libsoup/soup-converter-wrapper.c
@@ -34,12 +34,6 @@ enum {
        PROP_MESSAGE
 };
 
-static void soup_converter_wrapper_iface_init (GConverterIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (SoupConverterWrapper, soup_converter_wrapper, G_TYPE_OBJECT,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER,
-                                               soup_converter_wrapper_iface_init))
-
 struct _SoupConverterWrapperPrivate
 {
        GConverter *base_converter;
@@ -49,12 +43,17 @@ struct _SoupConverterWrapperPrivate
        gboolean discarding;
 };
 
+static void soup_converter_wrapper_iface_init (GConverterIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (SoupConverterWrapper, soup_converter_wrapper, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (SoupConverterWrapper)
+                        G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER,
+                                               soup_converter_wrapper_iface_init))
+
 static void
 soup_converter_wrapper_init (SoupConverterWrapper *converter)
 {
-       converter->priv = G_TYPE_INSTANCE_GET_PRIVATE (converter,
-                                                      SOUP_TYPE_CONVERTER_WRAPPER,
-                                                      SoupConverterWrapperPrivate);
+       converter->priv = soup_converter_wrapper_get_instance_private (converter);
 }
 
 static void
@@ -129,8 +128,6 @@ soup_converter_wrapper_class_init (SoupConverterWrapperClass *klass)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (klass, sizeof (SoupConverterWrapperPrivate));
-
        gobject_class->finalize = soup_converter_wrapper_finalize;
        gobject_class->get_property = soup_converter_wrapper_get_property;
        gobject_class->set_property = soup_converter_wrapper_set_property;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]