GVariant: support serialising to GVariantVectors

[platform/upstream/glib.git] / glib / gvariant-serialiser.h

diff --git a/glib/gvariant-serialiser.h b/glib/gvariant-serialiser.h
index d6a89b5..a558da0 100644 (file)
--- a/glib/gvariant-serialiser.h
+++ b/glib/gvariant-serialiser.h
@@ -13,9 +13,7 @@
  * 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
@@ -24,6 +22,7 @@
 #define __G_VARIANT_SERIALISER_H__
 
 #include "gvarianttypeinfo.h"
+#include "gvariant-vectors.h"
 
 typedef struct
 {
@@ -33,9 +32,9 @@ typedef struct
 } GVariantSerialised;
 
 /* deserialisation */
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 gsize                           g_variant_serialised_n_children         (GVariantSerialised        container);
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 GVariantSerialised              g_variant_serialised_get_child          (GVariantSerialised        container,
                                                                          gsize                     index);
 
@@ -43,33 +42,43 @@ GVariantSerialised              g_variant_serialised_get_child          (GVarian
 typedef void                  (*GVariantSerialisedFiller)               (GVariantSerialised       *serialised,
                                                                          gpointer                  data);
 
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 gsize                           g_variant_serialiser_needed_size        (GVariantTypeInfo         *info,
                                                                          GVariantSerialisedFiller  gsv_filler,
                                                                          const gpointer           *children,
                                                                          gsize                     n_children);
 
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 void                            g_variant_serialiser_serialise          (GVariantSerialised        container,
                                                                          GVariantSerialisedFiller  gsv_filler,
                                                                          const gpointer           *children,
                                                                          gsize                     n_children);
 
 /* misc */
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 gboolean                        g_variant_serialised_is_normal          (GVariantSerialised        value);
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 void                            g_variant_serialised_byteswap           (GVariantSerialised        value);
 
 /* validation of strings */
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 gboolean                        g_variant_serialiser_is_string          (gconstpointer             data,
                                                                          gsize                     size);
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 gboolean                        g_variant_serialiser_is_object_path     (gconstpointer             data,
                                                                          gsize                     size);
-G_GNUC_INTERNAL
+GLIB_AVAILABLE_IN_ALL
 gboolean                        g_variant_serialiser_is_signature       (gconstpointer             data,
                                                                          gsize                     size);
 
+
+gsize                           g_variant_callback_write_to_vectors     (GVariantVectors          *vectors,
+                                                                         gpointer                  data,
+                                                                         GVariantTypeInfo        **type_info);
+void                            g_variant_serialiser_write_to_vectors   (GVariantVectors          *items,
+                                                                         GVariantTypeInfo         *type_info,
+                                                                         gsize                     size,
+                                                                         const gpointer           *children,
+                                                                         gsize                     n_children);
+
 #endif /* __G_VARIANT_SERIALISER_H__ */