X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgmemoryinputstream.h;h=ee1be364b31cce22bad5513969030c7465a95b60;hb=7fd6f07d498063470903a886b4805a13bd333908;hp=3f39b0c184cc520bebd7a74804942b26eaf6943b;hpb=5247f12f3649726471080440de0d37b78c1cec33;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h
index 3f39b0c..ee1be36 100644
--- a/gio/gmemoryinputstream.h
+++ b/gio/gmemoryinputstream.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,17 +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_MEMORY_INPUT_STREAM_H__
 #define __G_MEMORY_INPUT_STREAM_H__
 
-#include <glib-object.h>
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #include <gio/ginputstream.h>
 
 G_BEGIN_DECLS
@@ -37,16 +38,15 @@ G_BEGIN_DECLS
 
 /**
  * GMemoryInputStream:
- * 
+ *
  * Implements #GInputStream for arbitrary memory chunks.
  **/
-typedef struct _GMemoryInputStream         GMemoryInputStream;
 typedef struct _GMemoryInputStreamClass    GMemoryInputStreamClass;
 typedef struct _GMemoryInputStreamPrivate  GMemoryInputStreamPrivate;
 
 struct _GMemoryInputStream
 {
-  GInputStream parent;
+  GInputStream parent_instance;
 
   /*< private >*/
   GMemoryInputStreamPrivate *priv;
@@ -54,7 +54,7 @@ struct _GMemoryInputStream
 
 struct _GMemoryInputStreamClass
 {
- GInputStreamClass parent_class;
+  GInputStreamClass parent_class;
 
   /* Padding for future expansion */
   void (*_g_reserved1) (void);
@@ -65,13 +65,25 @@ struct _GMemoryInputStreamClass
 };
 
 
-GType          g_memory_input_stream_get_type  (void) G_GNUC_CONST;
-GInputStream * g_memory_input_stream_from_data     (const void         *data,
-						    gssize              len);
-void           g_memory_input_stream_set_free_data (GMemoryInputStream *stream,
-						    gboolean            free_data);
-const void    *g_memory_input_stream_get_data      (GMemoryInputStream *stream);
-gsize          g_memory_input_stream_get_data_size (GMemoryInputStream *stream);
+GLIB_AVAILABLE_IN_ALL
+GType          g_memory_input_stream_get_type      (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GInputStream * g_memory_input_stream_new           (void);
+GLIB_AVAILABLE_IN_ALL
+GInputStream * g_memory_input_stream_new_from_data (const void         *data,
+                                                    gssize              len,
+                                                    GDestroyNotify      destroy);
+GLIB_AVAILABLE_IN_2_34
+GInputStream * g_memory_input_stream_new_from_bytes (GBytes            *bytes);
+
+GLIB_AVAILABLE_IN_ALL
+void           g_memory_input_stream_add_data      (GMemoryInputStream *stream,
+                                                    const void         *data,
+                                                    gssize              len,
+                                                    GDestroyNotify      destroy);
+GLIB_AVAILABLE_IN_2_34
+void           g_memory_input_stream_add_bytes     (GMemoryInputStream     *stream,
+						    GBytes                 *bytes);
 
 G_END_DECLS