#include "config.h"
#include "gfilteroutputstream.h"
-#include "gsimpleasyncresult.h"
#include "goutputstream.h"
#include "glibintl.h"
GCancellable *cancellable,
GError **error);
-G_DEFINE_ABSTRACT_TYPE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
-
-#define GET_PRIVATE(inst) G_TYPE_INSTANCE_GET_PRIVATE (inst, \
- G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamPrivate)
-
typedef struct
{
gboolean close_base;
} GFilterOutputStreamPrivate;
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
+
static void
g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
{
ostream_class->flush = g_filter_output_stream_flush;
ostream_class->close_fn = g_filter_output_stream_close;
- g_type_class_add_private (klass, sizeof (GFilterOutputStreamPrivate));
-
g_object_class_install_property (object_class,
PROP_BASE_STREAM,
g_param_spec_object ("base-stream",
GParamSpec *pspec)
{
GFilterOutputStream *filter_stream;
+ GFilterOutputStreamPrivate *priv;
filter_stream = G_FILTER_OUTPUT_STREAM (object);
+ priv = g_filter_output_stream_get_instance_private (filter_stream);
switch (prop_id)
{
break;
case PROP_CLOSE_BASE:
- g_value_set_boolean (value, GET_PRIVATE (filter_stream)->close_base);
+ g_value_set_boolean (value, priv->close_base);
break;
default:
gboolean
g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream)
{
+ GFilterOutputStreamPrivate *priv;
+
g_return_val_if_fail (G_IS_FILTER_OUTPUT_STREAM (stream), FALSE);
- return GET_PRIVATE (stream)->close_base;
+ priv = g_filter_output_stream_get_instance_private (stream);
+
+ return priv->close_base;
}
/**
close_base = !!close_base;
- priv = GET_PRIVATE (stream);
+ priv = g_filter_output_stream_get_instance_private (stream);
if (priv->close_base != close_base)
{
GCancellable *cancellable,
GError **error)
{
+ GFilterOutputStream *filter_stream = G_FILTER_OUTPUT_STREAM (stream);
+ GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_instance_private (filter_stream);
gboolean res = TRUE;
- if (GET_PRIVATE (stream)->close_base)
+ if (priv->close_base)
{
- GFilterOutputStream *filter_stream;
-
- filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
res = g_output_stream_close (filter_stream->base_stream,
cancellable,
error);