← Back to branch summary

~ubuntu-branches/ubuntu/saucy/glib2.0/saucy-proposed

« back to all changes in this revision

Viewing changes to gio/gfilteroutputstream.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-06-25 12:43:56 UTC
  • mfrom: (1.63.22)
  • Revision ID: package-import@ubuntu.com-20130625124356-597xf4lpikauchiy
Tags: 2.37.3-1ubuntu1
* Resynchronise on unrelease Debian SVN (glib is in NEW there). Remaining
  change:
  - Build-Depend on python:any for cross building.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/gfilteroutputstream.c
67
67
                                                     GCancellable   *cancellable,
68
68
                                                     GError        **error);
69
69
 
70
 
G_DEFINE_ABSTRACT_TYPE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
71
 
 
72
 
#define GET_PRIVATE(inst) G_TYPE_INSTANCE_GET_PRIVATE (inst, \
73
 
  G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamPrivate)
74
 
 
75
70
typedef struct
76
71
{
77
72
  gboolean close_base;
78
73
} GFilterOutputStreamPrivate;
79
74
 
 
75
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
 
76
 
80
77
static void
81
78
g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
82
79
{
93
90
  ostream_class->flush = g_filter_output_stream_flush;
94
91
  ostream_class->close_fn = g_filter_output_stream_close;
95
92
 
96
 
  g_type_class_add_private (klass, sizeof (GFilterOutputStreamPrivate));
97
 
 
98
93
  g_object_class_install_property (object_class,
99
94
                                   PROP_BASE_STREAM,
100
95
                                   g_param_spec_object ("base-stream",
150
145
                                     GParamSpec *pspec)
151
146
{
152
147
  GFilterOutputStream *filter_stream;
 
148
  GFilterOutputStreamPrivate *priv;
153
149
 
154
150
  filter_stream = G_FILTER_OUTPUT_STREAM (object);
 
151
  priv = g_filter_output_stream_get_instance_private (filter_stream);
155
152
 
156
153
  switch (prop_id)
157
154
    {
160
157
      break;
161
158
 
162
159
    case PROP_CLOSE_BASE:
163
 
      g_value_set_boolean (value, GET_PRIVATE (filter_stream)->close_base);
 
160
      g_value_set_boolean (value, priv->close_base);
164
161
      break;
165
162
 
166
163
    default:
220
217
gboolean
221
218
g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream)
222
219
{
 
220
  GFilterOutputStreamPrivate *priv;
 
221
 
223
222
  g_return_val_if_fail (G_IS_FILTER_OUTPUT_STREAM (stream), FALSE);
224
223
 
225
 
  return GET_PRIVATE (stream)->close_base;
 
224
  priv = g_filter_output_stream_get_instance_private (stream);
 
225
 
 
226
  return priv->close_base;
226
227
}
227
228
 
228
229
/**
242
243
 
243
244
  close_base = !!close_base;
244
245
 
245
 
  priv = GET_PRIVATE (stream);
 
246
  priv = g_filter_output_stream_get_instance_private (stream);
246
247
 
247
248
  if (priv->close_base != close_base)
248
249
    {
294
295
                              GCancellable   *cancellable,
295
296
                              GError        **error)
296
297
{
 
298
  GFilterOutputStream *filter_stream = G_FILTER_OUTPUT_STREAM (stream);
 
299
  GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_instance_private (filter_stream);
297
300
  gboolean res = TRUE;
298
301
 
299
 
  if (GET_PRIVATE (stream)->close_base)
 
302
  if (priv->close_base)
300
303
    {
301
 
      GFilterOutputStream *filter_stream;
302
 
 
303
 
      filter_stream = G_FILTER_OUTPUT_STREAM (stream);
304
 
 
305
304
      res = g_output_stream_close (filter_stream->base_stream,
306
305
                                   cancellable,
307
306
                                   error);