summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Casal Quinteiro <icq@gnome.org>2016-11-07 11:03:59 +0100
committerIgnacio Casal Quinteiro <icq@gnome.org>2016-11-10 11:00:34 +0100
commitf6f3f1c333ae6983808cbb1d6cd60f5cca9aa799 (patch)
tree1229f6c456a411746d11d4b9beae475c375bed87
parentc009be749bc57d1706c3a4a043ff9fb0c4aa4a7a (diff)
downloadlibsoup-f6f3f1c333ae6983808cbb1d6cd60f5cca9aa799.tar.gz
converter-wrapper: port to the new private api
https://bugzilla.gnome.org/show_bug.cgi?id=774189
-rw-r--r--libsoup/soup-converter-wrapper.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/libsoup/soup-converter-wrapper.c b/libsoup/soup-converter-wrapper.c
index d1837e62..133a3ebe 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;