From 78ec35f7abab5b65cbc8b71bb89441bf691b5fce Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 28 Jan 2014 10:55:44 +0000 Subject: [PATCH] gobject: box GVariantDict We will want to use this in GApplication for a signal and a property. https://bugzilla.gnome.org/show_bug.cgi?id=625408 --- docs/reference/gobject/gobject-sections.txt | 1 + gobject/gboxed.c | 1 + gobject/glib-types.h | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt index 1f331b6..6d7e44c 100644 --- a/docs/reference/gobject/gobject-sections.txt +++ b/docs/reference/gobject/gobject-sections.txt @@ -408,6 +408,7 @@ g_time_zone_get_type g_variant_get_gtype g_variant_type_get_gtype g_variant_builder_get_type +g_variant_dict_get_type g_gtype_get_type g_main_context_get_type g_main_loop_get_type diff --git a/gobject/gboxed.c b/gobject/gboxed.c index c77df25..ab41951 100644 --- a/gobject/gboxed.c +++ b/gobject/gboxed.c @@ -147,6 +147,7 @@ G_DEFINE_BOXED_TYPE (GVariantType, g_variant_type, g_variant_type_copy, g_varian #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 (GVariantDict, g_variant_dict, g_variant_dict_ref, g_variant_dict_unref) G_DEFINE_BOXED_TYPE (GError, g_error, g_error_copy, g_error_free) diff --git a/gobject/glib-types.h b/gobject/glib-types.h index 025ccae..e9f6472 100644 --- a/gobject/glib-types.h +++ b/gobject/glib-types.h @@ -199,6 +199,15 @@ typedef gsize GType; #define G_TYPE_VARIANT_BUILDER (g_variant_builder_get_type ()) /** + * G_TYPE_VARIANT_DICT: + * + * The #GType for a boxed type holding a #GVariantDict. + * + * Since: 2.40 + */ +#define G_TYPE_VARIANT_DICT (g_variant_dict_get_type ()) + +/** * G_TYPE_MAIN_LOOP: * * The #GType for a boxed type holding a #GMainLoop. @@ -313,6 +322,8 @@ GLIB_AVAILABLE_IN_ALL GType g_io_condition_get_type (void) G_GNUC_CONST; GLIB_AVAILABLE_IN_ALL GType g_variant_builder_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_40 +GType g_variant_dict_get_type (void) G_GNUC_CONST; GLIB_AVAILABLE_IN_ALL GType g_key_file_get_type (void) G_GNUC_CONST; GLIB_AVAILABLE_IN_2_30 -- 2.7.4