Use the new g_strv_contains

[platform/upstream/glib.git] / gio / gfilteroutputstream.h

diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h
index ba2d968..5f2faa7 100644 (file)
--- a/gio/gfilteroutputstream.h
+++ b/gio/gfilteroutputstream.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -13,21 +13,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
- * Author: Christian Kellner <gicmo@gnome.org> 
+ * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_FILTER_OUTPUT_STREAM_H__
+#define __G_FILTER_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
-#include <glib-object.h>
 #include <gio/goutputstream.h>
 
 G_BEGIN_DECLS
@@ -41,12 +38,10 @@ G_BEGIN_DECLS
 
 /**
  * GFilterOutputStream:
- * 
+ *
  * A base class for all output streams that work on an underlying stream.
  **/
-typedef struct _GFilterOutputStream         GFilterOutputStream;
 typedef struct _GFilterOutputStreamClass    GFilterOutputStreamClass;
-typedef struct _GFilterOutputStreamPrivate  GFilterOutputStreamPrivate;
 
 struct _GFilterOutputStream
 {
@@ -58,7 +53,7 @@ struct _GFilterOutputStream
 
 struct _GFilterOutputStreamClass
 {
- GOutputStreamClass parent_class;
+  GOutputStreamClass parent_class;
 
   /*< private >*/
   /* Padding for future expansion */
@@ -68,8 +63,16 @@ struct _GFilterOutputStreamClass
 };
 
 
-GType           g_filter_output_stream_get_type  (void) G_GNUC_CONST;
-GOutputStream  *g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
+GLIB_AVAILABLE_IN_ALL
+GType           g_filter_output_stream_get_type              (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GOutputStream * g_filter_output_stream_get_base_stream       (GFilterOutputStream *stream);
+GLIB_AVAILABLE_IN_ALL
+gboolean        g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
+GLIB_AVAILABLE_IN_ALL
+void            g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
+                                                              gboolean             close_base);
+
 G_END_DECLS
 
 #endif /* __G_FILTER_OUTPUT_STREAM_H__ */