Add a boxed type for GVariantBuilder, mark GVariantIter as (skip)

Based on a patch by Giovanni Campagna <gcampagna@src.gnome.org>

From discussion, GVariantIter is not useful for bindings, but
GVariantBuilder may be.

https://bugzilla.gnome.org/show_bug.cgi?id=646635

diff --git a/glib/gvariant.c b/glib/gvariant.c
index bbe9d52..b7d458a 100644 (file)
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -2507,7 +2507,7 @@ g_variant_compare (gconstpointer one,
 
 /* GVariantIter {{{1 */
 /**
- * GVariantIter:
+ * GVariantIter: (skip)
  *
  * #GVariantIter is an opaque data structure and can only be accessed
  * using the following functions.

diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index 06b3cf2..b095539 100644 (file)
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -138,6 +138,8 @@ GType g_regex_get_type (void) { return G_TYPE_INVALID; }
 G_DEFINE_BOXED_TYPE (GVariantType, g_variant_type, g_variant_type_copy, g_variant_type_free)
 #undef g_variant_type_get_type
 
+G_DEFINE_BOXED_TYPE (GVariantBuilder, g_variant_builder, g_variant_builder_ref, g_variant_builder_unref)
+
 G_DEFINE_BOXED_TYPE (GError, g_error, g_error_copy, g_error_free)
 
 G_DEFINE_BOXED_TYPE (GDateTime, g_date_time, g_date_time_ref, g_date_time_unref);

diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index 2c25e85..239853d 100644 (file)
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.h
@@ -162,6 +162,15 @@ typedef gsize GType;
  */
 #define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
 
+/**
+ * G_TYPE_VARIANT_BUILDER:
+ *
+ * The #GType for a boxed type holding a #GVariantBuilder.
+ *
+ * Since: 2.30
+ */
+#define G_TYPE_VARIANT_BUILDER (g_variant_builder_get_type ())
+
 GType   g_date_get_type            (void) G_GNUC_CONST;
 GType   g_strv_get_type            (void) G_GNUC_CONST;
 GType   g_gstring_get_type         (void) G_GNUC_CONST;
@@ -175,6 +184,7 @@ GType   g_error_get_type           (void) G_GNUC_CONST;
 GType   g_date_time_get_type       (void) G_GNUC_CONST;
 GType   g_io_channel_get_type      (void) G_GNUC_CONST;
 GType   g_io_condition_get_type    (void) G_GNUC_CONST;
+GType   g_variant_builder_get_type (void) G_GNUC_CONST;
 
 #if !defined(G_DISABLE_DEPRECATED) || defined(__GI_SCANNER__)
 GType   g_variant_get_gtype        (void) G_GNUC_CONST;

diff --git a/gobject/gobject.symbols b/gobject/gobject.symbols
index b72176a..de41053 100644 (file)
--- a/gobject/gobject.symbols
+++ b/gobject/gobject.symbols
@@ -24,6 +24,7 @@ g_byte_array_get_type
 g_error_get_type
 g_ptr_array_get_type
 g_regex_get_type
+g_variant_builder_get_type
 g_variant_type_get_gtype
 g_closure_get_type
 g_value_get_type