summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2012-09-03 19:43:50 (GMT)
committerMartin Pitt <martinpitt@gnome.org>2012-09-06 04:18:42 (GMT)
commit02f143c2d9fa793f872df65441f86bc958d5c731 (patch)
treeb1d7c3efc536d9f4319b55ca22151506f50cd098
parentf4980c6295c73aa218532cfb6de0e210eac9a3f3 (diff)
downloadglib-02f143c2d9fa.zip
glib-02f143c2d9fa.tar.xz
Box GTimeZone to make it introspectable
https://bugzilla.gnome.org/show_bug.cgi?id=683167
-rw-r--r--docs/reference/gobject/gobject-sections.txt2
-rw-r--r--gobject/gboxed.c1
-rw-r--r--gobject/glib-types.h10
-rw-r--r--gobject/gobject.symbols1
4 files changed, 14 insertions, 0 deletions
diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt
index 03f513c..abcf248 100644
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@ -365,6 +365,7 @@ G_TYPE_BYTES
G_TYPE_VARIANT_TYPE
G_TYPE_ERROR
G_TYPE_DATE_TIME
+G_TYPE_TIME_ZONE
G_TYPE_IO_CHANNEL
G_TYPE_IO_CONDITION
G_TYPE_VARIANT_BUILDER
@@ -389,6 +390,7 @@ g_byte_array_get_type
g_ptr_array_get_type
g_error_get_type
g_date_time_get_type
+g_time_zone_get_type
g_variant_get_gtype
g_variant_type_get_gtype
g_variant_builder_get_type
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index 7936d45..b5c6029 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -144,6 +144,7 @@ G_DEFINE_BOXED_TYPE (GVariantBuilder, g_variant_builder, g_variant_builder_ref,
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);
+G_DEFINE_BOXED_TYPE (GTimeZone, g_time_zone, g_time_zone_ref, g_time_zone_unref);
G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref)
G_DEFINE_BOXED_TYPE (GMainLoop, g_main_loop, g_main_loop_ref, g_main_loop_unref)
diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index e262534..50bc033 100644
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.h
@@ -169,6 +169,15 @@ typedef gsize GType;
#define G_TYPE_DATE_TIME (g_date_time_get_type ())
/**
+ * G_TYPE_TIME_ZONE:
+ *
+ * The #GType for a boxed type holding a #GTimeZone.
+ *
+ * Since: 2.34
+ */
+#define G_TYPE_TIME_ZONE (g_time_zone_get_type ())
+
+/**
* G_TYPE_IO_CHANNEL:
*
* The #GType for #GIOChannel.
@@ -241,6 +250,7 @@ GLIB_AVAILABLE_IN_2_30
GType g_match_info_get_type (void) G_GNUC_CONST;
GType g_error_get_type (void) G_GNUC_CONST;
GType g_date_time_get_type (void) G_GNUC_CONST;
+GType g_time_zone_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;
diff --git a/gobject/gobject.symbols b/gobject/gobject.symbols
index bed2ec9..b5fa09e 100644
--- a/gobject/gobject.symbols
+++ b/gobject/gobject.symbols
@@ -16,6 +16,7 @@ g_boxed_free
g_boxed_type_register_static
g_date_get_type
g_date_time_get_type
+g_time_zone_get_type
g_gstring_get_type
g_strv_get_type
g_hash_table_get_type