diff options
| author | Ignacio Casal Quinteiro <icq@gnome.org> | 2016-12-01 08:43:32 +0100 |
|---|---|---|
| committer | Ignacio Casal Quinteiro <icq@gnome.org> | 2016-12-03 21:56:33 +0100 |
| commit | cb2f7854ccb4069197898b693ff82c29cc69a5ef (patch) | |
| tree | 1e91af654fce067dde056fe6386a208f4c9a96b4 /libsoup/soup-multipart-input-stream.c | |
| parent | efcb377dde512f453ee90e31682540678f37fdae (diff) | |
| download | libsoup-cb2f7854ccb4069197898b693ff82c29cc69a5ef.tar.gz | |
Port more classes to the new private api
Now only SoupMessage is missing since the private from this class
is accessed from other classes.
Diffstat (limited to 'libsoup/soup-multipart-input-stream.c')
| -rw-r--r-- | libsoup/soup-multipart-input-stream.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libsoup/soup-multipart-input-stream.c b/libsoup/soup-multipart-input-stream.c index a1a66838..d44991cb 100644 --- a/libsoup/soup-multipart-input-stream.c +++ b/libsoup/soup-multipart-input-stream.c @@ -37,12 +37,6 @@ * Since: 2.40 **/ -static void soup_multipart_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data); - -G_DEFINE_TYPE_WITH_CODE (SoupMultipartInputStream, soup_multipart_input_stream, G_TYPE_FILTER_INPUT_STREAM, - G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, - soup_multipart_input_stream_pollable_init)) - enum { PROP_0, @@ -65,6 +59,13 @@ struct _SoupMultipartInputStreamPrivate { goffset remaining_bytes; }; +static void soup_multipart_input_stream_pollable_init (GPollableInputStreamInterface *pollable_interface, gpointer interface_data); + +G_DEFINE_TYPE_WITH_CODE (SoupMultipartInputStream, soup_multipart_input_stream, G_TYPE_FILTER_INPUT_STREAM, + G_ADD_PRIVATE (SoupMultipartInputStream) + G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, + soup_multipart_input_stream_pollable_init)) + static void soup_multipart_input_stream_dispose (GObject *object) { @@ -201,9 +202,7 @@ static void soup_multipart_input_stream_init (SoupMultipartInputStream *multipart) { SoupMultipartInputStreamPrivate *priv; - priv = multipart->priv = G_TYPE_INSTANCE_GET_PRIVATE (multipart, - SOUP_TYPE_MULTIPART_INPUT_STREAM, - SoupMultipartInputStreamPrivate); + priv = multipart->priv = soup_multipart_input_stream_get_instance_private (multipart); priv->meta_buf = g_byte_array_sized_new (RESPONSE_BLOCK_SIZE); priv->done_with_part = FALSE; @@ -290,8 +289,6 @@ soup_multipart_input_stream_class_init (SoupMultipartInputStreamClass *multipart GInputStreamClass *input_stream_class = G_INPUT_STREAM_CLASS (multipart_class); - g_type_class_add_private (multipart_class, sizeof (SoupMultipartInputStreamPrivate)); - object_class->dispose = soup_multipart_input_stream_dispose; object_class->finalize = soup_multipart_input_stream_finalize; object_class->constructed = soup_multipart_input_stream_constructed; |