hook gvariant vectors up to kdbus

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

diff --git a/gio/gsocketinputstream.h b/gio/gsocketinputstream.h
index 31b79ce..8e5776f 100644 (file)
--- a/gio/gsocketinputstream.h
+++ b/gio/gsocketinputstream.h
@@ -1,68 +1,58 @@
 /* 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
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
+ * Copyright © 2009 Codethink Limited
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the licence or (at
+ * your option) any later version.
  *
- * 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.
+ * See the included COPYING file for more information.
  *
- * Author: Alexander Larsson <alexl@redhat.com>
+ * Authors: Christian Kellner <gicmo@gnome.org>
+ *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
+ *          Ryan Lortie <desrt@desrt.ca>
  */
 
 #ifndef __G_SOCKET_INPUT_STREAM_H__
 #define __G_SOCKET_INPUT_STREAM_H__
 
 #include <gio/ginputstream.h>
+#include <gio/gsocket.h>
 
 G_BEGIN_DECLS
 
-#define G_TYPE_SOCKET_INPUT_STREAM         (g_socket_input_stream_get_type ())
-#define G_SOCKET_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_INPUT_STREAM, GSocketInputStream))
-#define G_SOCKET_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_INPUT_STREAM, GSocketInputStreamClass))
-#define G_IS_SOCKET_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_INPUT_STREAM))
-#define G_IS_SOCKET_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_INPUT_STREAM))
-#define G_SOCKET_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_INPUT_STREAM, GSocketInputStreamClass))
-
-typedef struct _GSocketInputStream         GSocketInputStream;
-typedef struct _GSocketInputStreamClass    GSocketInputStreamClass;
-typedef struct _GSocketInputStreamPrivate  GSocketInputStreamPrivate;
-
-struct _GSocketInputStream
-{
-  GInputStream parent;
-
-  /*< private >*/
-  GSocketInputStreamPrivate *priv;
-};
+#define G_TYPE_SOCKET_INPUT_STREAM                          (_g_socket_input_stream_get_type ())
+#define G_SOCKET_INPUT_STREAM(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             G_TYPE_SOCKET_INPUT_STREAM, GSocketInputStream))
+#define G_SOCKET_INPUT_STREAM_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
+                                                             G_TYPE_SOCKET_INPUT_STREAM, GSocketInputStreamClass))
+#define G_IS_SOCKET_INPUT_STREAM(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             G_TYPE_SOCKET_INPUT_STREAM))
+#define G_IS_SOCKET_INPUT_STREAM_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
+                                                             G_TYPE_SOCKET_INPUT_STREAM))
+#define G_SOCKET_INPUT_STREAM_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
+                                                             G_TYPE_SOCKET_INPUT_STREAM, GSocketInputStreamClass))
+
+typedef struct _GSocketInputStreamPrivate                   GSocketInputStreamPrivate;
+typedef struct _GSocketInputStreamClass                     GSocketInputStreamClass;
+typedef struct _GSocketInputStream                          GSocketInputStream;
 
 struct _GSocketInputStreamClass
 {
   GInputStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
 };
 
-GType g_socket_input_stream_get_type (void) G_GNUC_CONST;
+struct _GSocketInputStream
+{
+  GInputStream parent_instance;
+  GSocketInputStreamPrivate *priv;
+};
 
-GInputStream *g_socket_input_stream_new (int fd,
-                                        gboolean close_fd_at_close);
+GType                   _g_socket_input_stream_get_type                  (void) G_GNUC_CONST;
+GSocketInputStream *    _g_socket_input_stream_new                      (GSocket *socket);
 
 G_END_DECLS
 
-#endif /* __G_SOCKET_INPUT_STREAM_H__ */
+#endif /* __G_SOCKET_INPUT_STREAM_H___ */