merge GVariant

This commit is contained in:
Ryan Lortie
2010-02-10 11:13:06 -05:00
parent 2afe2325c4
commit 1e655eb02c
14 changed files with 1039 additions and 3 deletions

View File

@@ -269,6 +269,33 @@ g_byte_array_get_type (void)
type_id = g_boxed_type_register_static (g_intern_static_string ("GByteArray"),
(GBoxedCopyFunc) g_byte_array_ref,
(GBoxedFreeFunc) g_byte_array_unref);
return type_id;
}
GType
g_variant_type_get_gtype (void)
{
static GType type_id = 0;
if (!type_id)
type_id = g_boxed_type_register_static (g_intern_static_string ("GVariantType"),
(GBoxedCopyFunc) g_variant_type_copy,
(GBoxedFreeFunc) g_variant_type_free);
return type_id;
}
GType
g_variant_get_gtype (void)
{
static GType type_id = 0;
if (!type_id)
type_id = g_boxed_type_register_static (g_intern_static_string ("GVariant"),
(GBoxedCopyFunc) g_variant_ref,
(GBoxedFreeFunc) g_variant_unref);
return type_id;
}

View File

@@ -186,6 +186,22 @@ GType g_boxed_type_register_static (const gchar *name,
* Since: 2.22
*/
#define G_TYPE_PTR_ARRAY (g_ptr_array_get_type ())
/**
* G_TYPE_VARIANT_TYPE:
*
* The #GType for a boxed type holding a #GVariantType.
*
* Since: 2.24
*/
#define G_TYPE_VARIANT_TYPE (g_variant_type_get_gtype ())
/**
* G_TYPE_VARIANT:
*
* The #GType for a boxed type holding a #GVariant reference.
*
* Since: 2.24
*/
#define G_TYPE_VARIANT (g_variant_get_gtype ())
void g_value_take_boxed (GValue *value,
@@ -204,6 +220,8 @@ GType g_hash_table_get_type (void) G_GNUC_CONST;
GType g_array_get_type (void) G_GNUC_CONST;
GType g_byte_array_get_type (void) G_GNUC_CONST;
GType g_ptr_array_get_type (void) G_GNUC_CONST;
GType g_variant_type_get_gtype(void) G_GNUC_CONST;
GType g_variant_get_gtype (void) G_GNUC_CONST;
GType g_regex_get_type (void) G_GNUC_CONST;
/**

View File

@@ -24,6 +24,8 @@ g_array_get_type G_GNUC_CONST
g_byte_array_get_type G_GNUC_CONST
g_ptr_array_get_type G_GNUC_CONST
g_regex_get_type G_GNUC_CONST
g_variant_type_get_gtype G_GNUC_CONST
g_variant_get_gtype G_GNUC_CONST
g_closure_get_type G_GNUC_CONST
g_value_get_type G_GNUC_CONST
g_value_array_get_type G_GNUC_CONST